diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - view.hideProgress(); - view.obtainDataFail(); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java new file mode 100644 index 0000000..87ee4c3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java @@ -0,0 +1,666 @@ +package com.casic.dcms.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.media.MediaMetadataRetriever; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.TextView; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; +import com.casic.dcms.adapter.NineGridImageAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.databinding.ActivityUploadCommonCaseBinding; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; +import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.utils.AudioRecodeHelper; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.JzExoMedia; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.TimeOrDateUtil; +import com.casic.dcms.utils.ToastHelper; +import com.casic.dcms.widgets.AlertControlDialog; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.entity.LocalMedia; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import com.qmuiteam.qmui.widget.popup.QMUIPopup; +import com.qmuiteam.qmui.widget.popup.QMUIPopups; +import com.zolad.videoslimmer.VideoSlimmer; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cn.jzvd.Jzvd; + +public class CommonCaseUploadActivity extends AndroidxBaseActivity + implements View.OnClickListener, View.OnTouchListener, ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { + + private static final String TAG = "CaseUploadActivity"; + private final Context context = CommonCaseUploadActivity.this; + private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 + private final ArrayList realPaths = new ArrayList<>();//真实图片路径 + private CaseLargeTypePresenterImpl largeClassPresenter; + private CaseSmallTypePresenterImpl smallTypePresenter; + private SubmitCasePresenterImpl submitCasePresenter; + private UploadImagePresenterImpl uploadImagePresenter; + private UploadAudioPresenterImpl uploadAudioPresenter; + private UploadVideoPresenterImpl uploadVideoPresenter; + private List largeTypeBeans; + private List smallTypeBeans; + private QMUITipDialog submitDialog; + private ProgressDialog progressDialog; + private NineGridImageAdapter imageAdapter; + private AudioRecodeHelper audioRecodeHelper; + private PopupWindow popWindow; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 + private String gridId; + private String audioUrl, videoUrl; + private boolean isFirstEnter = true; + + private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + if (result.getResultCode() == Activity.RESULT_OK) { + Intent data = result.getData(); + if (data == null) { + return; + } + double longitude = data.getDoubleExtra("longitude", 0); + double latitude = data.getDoubleExtra("latitude", 0); + gridId = data.getStringExtra("gridId"); + String community = data.getStringExtra("community"); + + viewBinding.longitudeView.setText(String.valueOf(longitude)); + viewBinding.latitudeView.setText(String.valueOf(latitude)); + viewBinding.communityNameView.setText(community); + } + } + }); + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷上报"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + public void initData() { + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); + largeClassPresenter = new CaseLargeTypePresenterImpl(this); + smallTypePresenter = new CaseSmallTypePresenterImpl(this); + submitCasePresenter = new SubmitCasePresenterImpl(this); + submitDialog = new QMUITipDialog.Builder(this) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord("处理中，请稍后") + .create(); + progressDialog = new ProgressDialog(this); + progressDialog.setMessage("视频压缩中..."); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); + progressDialog.setCancelable(false); + progressDialog.setCanceledOnTouchOutside(false); + + uploadImagePresenter = new UploadImagePresenterImpl(this); + uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); + + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + + //图片九宫格 + imageAdapter = new NineGridImageAdapter(this); + viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); + viewBinding.selectedGridViewView.setAdapter(imageAdapter); + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public void initEvent() { + viewBinding.caseClassLayout.setOnClickListener(this); + viewBinding.caseLargeClassLayout.setOnClickListener(this); + viewBinding.caseSmallClassLayout.setOnClickListener(this); + viewBinding.locationMapView.setOnClickListener(this); + viewBinding.addVideoView.setOnClickListener(this); + viewBinding.deleteView.setOnClickListener(this); + viewBinding.submitButton.setOnClickListener(this); + + viewBinding.recodeAudioButton.setOnTouchListener(this); + viewBinding.submitButton.setChangeAlphaWhenPress(true); + //录音相关 + View view = View.inflate(this, R.layout.popu_microphone, null); + int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); + int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); + popWindow = new PopupWindow(view, popWidth, popHeight, true); + popWindow.setAnimationStyle(R.style.PopupAnimation); + ImageView recodeImageView = view.findViewById(R.id.recodeImageView); + TextView recodeTextView = view.findViewById(R.id.recodeTextView); + audioRecodeHelper = new AudioRecodeHelper(); + audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { + @Override + public void onUpdate(double db, long time) { + recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); + recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + } + + @Override + public void onStop(String filePath) { + uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); + } + }); + + //图片九宫格事件处理 + imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { + @Override + public void onAddImageClick() { + new QMUIDialog.MenuDialogBuilder(context) + .addItem("相册中选取", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.selectPicture(CommonCaseUploadActivity.this); + } + }) + .addItem("相机拍照", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.takePicture(CommonCaseUploadActivity.this); + } + }) + .create().show(); + } + + @Override + public void onItemClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); + } + + @Override + public void onItemLongClick(View view, int position) { + imageList.remove(position); + imageAdapter.deleteImage(position); + } + }); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.caseClassLayout) { + new QMUIBottomSheet.BottomListSheetBuilder(this) + .setTitle("案卷类型") + .addItem("事件") + .addItem("部件") + .setGravityCenter(true) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseClassView.setText(tag); + viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷大类 + largeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + } + }).build().show(); + } else if (id == R.id.caseLargeClassLayout) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷大类"); + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseLargeClassView.setText(tag); + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷小类 + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); + eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); + String typeId = dataBean.getId(); + + smallTypePresenter.onReadyRetrofitRequest(eorc, typeId); + } + }).build().show(); + } + } + } else if (id == R.id.caseSmallClassLayout) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷小类"); + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeDetailName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseSmallClassView.setText(tag); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); + } + }).build().show(); + } + } + } else if (id == R.id.locationMapView) { + String type = viewBinding.caseClassView.getText().toString(); + if (type.equals("")) { + ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); + return; + } + Intent intent = new Intent(this, ArcGISMapActivity.class); + intent.putExtra("type", type); + uploadCaseLauncher.launch(intent); + } else if (id == R.id.addVideoView) { + OtherUtils.takeVideo(this); + } else if (id == R.id.deleteView) { + if (viewBinding.videoPlayerView.isShown()) { + new AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("确定重新拍摄视频材料？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + viewBinding.videoPlayerView.setVisibility(View.GONE); + viewBinding.addVideoView.setVisibility(View.VISIBLE); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + } else if (id == R.id.submitButton) { + submitCase(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) { + switch (requestCode) { + case PictureConfig.CHOOSE_REQUEST: + List selectList = PictureSelector.obtainMultipleResult(data); + for (LocalMedia media : selectList) { + File file = new File(media.getCompressPath()); + if (file.length() <= Constant.IMAGE_MINUS_SIZE) { + ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); + continue; + } + uploadImagePresenter.onReadyRetrofitRequest(file); + } + break; + case PictureConfig.REQUEST_CAMERA: + LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); + uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); + break; + case PictureConfig.PREVIEW_VIDEO_CODE: + LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); + //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" + //需要手动压缩视频 + String mediaRealPath = media.getRealPath(); + if (TextUtils.isEmpty(mediaRealPath)) { + //部分手机getRealPath可能为空，需要备用路径 + mediaRealPath = media.getPath(); + } + if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { + //如果默认和备用路径还是为空，则不压缩上传 + ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); + return; + } + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + retriever.setDataSource(mediaRealPath); + String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); + + assert defaultRotation != null; + compressVideo(mediaRealPath, defaultRotation, defaultBitrate); + break; + default: + break; + } + } + } + + /** + * 6.0以上视频压缩 + */ + private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { + Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); + String outputVideoFile = FileUtils.getOutputVideoFile(); + int width, height, bitrate; + if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 + width = Constant.DEFAULT_WIDTH / 2; + height = Constant.DEFAULT_HEIGHT / 2; + } else { + width = Constant.DEFAULT_HEIGHT / 2; + height = Constant.DEFAULT_WIDTH / 2; + } + if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { + bitrate = Constant.BITRATE; + } else { + bitrate = Integer.parseInt(defaultBitrate) / 2; + } + VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { + @Override + public void onStart() { + progressDialog.show(); + } + + @Override + public void onProgress(float percent) { + progressDialog.setProgress((int) percent); + } + + @Override + public void onFinish(boolean result) { + if (result) { + uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); + } else { + ToastHelper.showToast("压缩失败", ToastHelper.ERROR); + } + progressDialog.dismiss(); + } + }); + } + + /** + * 首次进入页面显示引导Popup + */ + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (isFirstEnter) { + TextView textView = new TextView(this); + int padding = QMUIDisplayHelper.dp2px(this, 10); + textView.setPadding(padding, padding, padding, padding); + textView.setGravity(Gravity.CENTER); + textView.setText("按住即可开始录音"); + QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) + .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) + .view(textView) + .shadow(true) + .arrow(true) + .animStyle(QMUIPopup.ANIM_AUTO) + .dimAmount(0.6f)//60%透明度 + .onDismiss(null) + .show(viewBinding.recodeAudioButton); + isFirstEnter = false; + } + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); + popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); + audioRecodeHelper.startRecordAudio(); + break; + case MotionEvent.ACTION_UP: + audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） + popWindow.dismiss(); + viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); + break; + } + return true; + } + + @Override + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { + viewBinding.caseLargeClassView.setText("无小类"); + } else { + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 + } + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + + viewBinding.caseSmallClassView.setText("请选择"); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { + viewBinding.caseSmallClassView.setText("无小类"); + } else { + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 + } + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void showProgress() { + submitDialog.show(); + } + + @SuppressLint("SetTextI18n") + @Override + public void obtainUploadAudioResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + audioUrl = resultBean.getData(); + /** + * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a + * */ + if (!TextUtils.isEmpty(audioUrl)) { + viewBinding.audioPlayerView.setVisibility(View.VISIBLE); + viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); + } + } + } + + @Override + public void obtainUploadImageResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + /** + * 系统路径static拼接图片返回路径 + * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg + */ + //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg + if (imageAdapter.getItemCount() <= 2) { + String url = resultBean.getData(); + imageList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + imageAdapter.setupImage(realPaths); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } + } + } + + @Override + public void obtainUploadVideoResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 + viewBinding.addVideoView.setVisibility(View.GONE); + viewBinding.videoPlayerView.setVisibility(View.VISIBLE); + videoUrl = resultBean.getData(); + String completeURL = StringHelper.appendCompleteURL(videoUrl); + viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); + //设置第一帧为封面 + Glide.with(context) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(completeURL) + .into(viewBinding.videoPlayerView.posterImageView); + } + } + + /** + * 案卷提交 + */ + private void submitCase() { + String longitude = viewBinding.longitudeView.getText().toString(); + String latitude = viewBinding.latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } + if (eorc.equals("") || typeCode.equals("")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(fieldIntro)) { + ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; + } + String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(description)) { + ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; + } + if (imageAdapter.getItemCount() != 2) { + ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); + return; + } + submitCasePresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, + "2", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); + } + + @Override + public void obtainSubmitResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); + finish(); + } else { + ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ + } + + @Override + public void hideProgress() { + submitDialog.dismiss(); + } + + @Override + protected void onDestroy() { + if (largeClassPresenter != null) { + largeClassPresenter.disposeRetrofitRequest(); + } + if (smallTypePresenter != null) { + smallTypePresenter.disposeRetrofitRequest(); + } + if (submitCasePresenter != null) { + submitCasePresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (uploadAudioPresenter != null) { + uploadAudioPresenter.disposeRetrofitRequest(); + } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } + viewBinding.audioPlayerView.release(); + super.onDestroy(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java new file mode 100644 index 0000000..87ee4c3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java @@ -0,0 +1,666 @@ +package com.casic.dcms.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.media.MediaMetadataRetriever; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.TextView; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; +import com.casic.dcms.adapter.NineGridImageAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.databinding.ActivityUploadCommonCaseBinding; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; +import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.utils.AudioRecodeHelper; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.JzExoMedia; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.TimeOrDateUtil; +import com.casic.dcms.utils.ToastHelper; +import com.casic.dcms.widgets.AlertControlDialog; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.entity.LocalMedia; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import com.qmuiteam.qmui.widget.popup.QMUIPopup; +import com.qmuiteam.qmui.widget.popup.QMUIPopups; +import com.zolad.videoslimmer.VideoSlimmer; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cn.jzvd.Jzvd; + +public class CommonCaseUploadActivity extends AndroidxBaseActivity + implements View.OnClickListener, View.OnTouchListener, ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { + + private static final String TAG = "CaseUploadActivity"; + private final Context context = CommonCaseUploadActivity.this; + private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 + private final ArrayList realPaths = new ArrayList<>();//真实图片路径 + private CaseLargeTypePresenterImpl largeClassPresenter; + private CaseSmallTypePresenterImpl smallTypePresenter; + private SubmitCasePresenterImpl submitCasePresenter; + private UploadImagePresenterImpl uploadImagePresenter; + private UploadAudioPresenterImpl uploadAudioPresenter; + private UploadVideoPresenterImpl uploadVideoPresenter; + private List largeTypeBeans; + private List smallTypeBeans; + private QMUITipDialog submitDialog; + private ProgressDialog progressDialog; + private NineGridImageAdapter imageAdapter; + private AudioRecodeHelper audioRecodeHelper; + private PopupWindow popWindow; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 + private String gridId; + private String audioUrl, videoUrl; + private boolean isFirstEnter = true; + + private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + if (result.getResultCode() == Activity.RESULT_OK) { + Intent data = result.getData(); + if (data == null) { + return; + } + double longitude = data.getDoubleExtra("longitude", 0); + double latitude = data.getDoubleExtra("latitude", 0); + gridId = data.getStringExtra("gridId"); + String community = data.getStringExtra("community"); + + viewBinding.longitudeView.setText(String.valueOf(longitude)); + viewBinding.latitudeView.setText(String.valueOf(latitude)); + viewBinding.communityNameView.setText(community); + } + } + }); + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷上报"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + public void initData() { + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); + largeClassPresenter = new CaseLargeTypePresenterImpl(this); + smallTypePresenter = new CaseSmallTypePresenterImpl(this); + submitCasePresenter = new SubmitCasePresenterImpl(this); + submitDialog = new QMUITipDialog.Builder(this) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord("处理中，请稍后") + .create(); + progressDialog = new ProgressDialog(this); + progressDialog.setMessage("视频压缩中..."); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); + progressDialog.setCancelable(false); + progressDialog.setCanceledOnTouchOutside(false); + + uploadImagePresenter = new UploadImagePresenterImpl(this); + uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); + + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + + //图片九宫格 + imageAdapter = new NineGridImageAdapter(this); + viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); + viewBinding.selectedGridViewView.setAdapter(imageAdapter); + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public void initEvent() { + viewBinding.caseClassLayout.setOnClickListener(this); + viewBinding.caseLargeClassLayout.setOnClickListener(this); + viewBinding.caseSmallClassLayout.setOnClickListener(this); + viewBinding.locationMapView.setOnClickListener(this); + viewBinding.addVideoView.setOnClickListener(this); + viewBinding.deleteView.setOnClickListener(this); + viewBinding.submitButton.setOnClickListener(this); + + viewBinding.recodeAudioButton.setOnTouchListener(this); + viewBinding.submitButton.setChangeAlphaWhenPress(true); + //录音相关 + View view = View.inflate(this, R.layout.popu_microphone, null); + int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); + int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); + popWindow = new PopupWindow(view, popWidth, popHeight, true); + popWindow.setAnimationStyle(R.style.PopupAnimation); + ImageView recodeImageView = view.findViewById(R.id.recodeImageView); + TextView recodeTextView = view.findViewById(R.id.recodeTextView); + audioRecodeHelper = new AudioRecodeHelper(); + audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { + @Override + public void onUpdate(double db, long time) { + recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); + recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + } + + @Override + public void onStop(String filePath) { + uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); + } + }); + + //图片九宫格事件处理 + imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { + @Override + public void onAddImageClick() { + new QMUIDialog.MenuDialogBuilder(context) + .addItem("相册中选取", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.selectPicture(CommonCaseUploadActivity.this); + } + }) + .addItem("相机拍照", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.takePicture(CommonCaseUploadActivity.this); + } + }) + .create().show(); + } + + @Override + public void onItemClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); + } + + @Override + public void onItemLongClick(View view, int position) { + imageList.remove(position); + imageAdapter.deleteImage(position); + } + }); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.caseClassLayout) { + new QMUIBottomSheet.BottomListSheetBuilder(this) + .setTitle("案卷类型") + .addItem("事件") + .addItem("部件") + .setGravityCenter(true) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseClassView.setText(tag); + viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷大类 + largeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + } + }).build().show(); + } else if (id == R.id.caseLargeClassLayout) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷大类"); + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseLargeClassView.setText(tag); + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷小类 + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); + eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); + String typeId = dataBean.getId(); + + smallTypePresenter.onReadyRetrofitRequest(eorc, typeId); + } + }).build().show(); + } + } + } else if (id == R.id.caseSmallClassLayout) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷小类"); + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeDetailName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseSmallClassView.setText(tag); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); + } + }).build().show(); + } + } + } else if (id == R.id.locationMapView) { + String type = viewBinding.caseClassView.getText().toString(); + if (type.equals("")) { + ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); + return; + } + Intent intent = new Intent(this, ArcGISMapActivity.class); + intent.putExtra("type", type); + uploadCaseLauncher.launch(intent); + } else if (id == R.id.addVideoView) { + OtherUtils.takeVideo(this); + } else if (id == R.id.deleteView) { + if (viewBinding.videoPlayerView.isShown()) { + new AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("确定重新拍摄视频材料？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + viewBinding.videoPlayerView.setVisibility(View.GONE); + viewBinding.addVideoView.setVisibility(View.VISIBLE); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + } else if (id == R.id.submitButton) { + submitCase(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) { + switch (requestCode) { + case PictureConfig.CHOOSE_REQUEST: + List selectList = PictureSelector.obtainMultipleResult(data); + for (LocalMedia media : selectList) { + File file = new File(media.getCompressPath()); + if (file.length() <= Constant.IMAGE_MINUS_SIZE) { + ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); + continue; + } + uploadImagePresenter.onReadyRetrofitRequest(file); + } + break; + case PictureConfig.REQUEST_CAMERA: + LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); + uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); + break; + case PictureConfig.PREVIEW_VIDEO_CODE: + LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); + //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" + //需要手动压缩视频 + String mediaRealPath = media.getRealPath(); + if (TextUtils.isEmpty(mediaRealPath)) { + //部分手机getRealPath可能为空，需要备用路径 + mediaRealPath = media.getPath(); + } + if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { + //如果默认和备用路径还是为空，则不压缩上传 + ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); + return; + } + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + retriever.setDataSource(mediaRealPath); + String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); + + assert defaultRotation != null; + compressVideo(mediaRealPath, defaultRotation, defaultBitrate); + break; + default: + break; + } + } + } + + /** + * 6.0以上视频压缩 + */ + private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { + Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); + String outputVideoFile = FileUtils.getOutputVideoFile(); + int width, height, bitrate; + if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 + width = Constant.DEFAULT_WIDTH / 2; + height = Constant.DEFAULT_HEIGHT / 2; + } else { + width = Constant.DEFAULT_HEIGHT / 2; + height = Constant.DEFAULT_WIDTH / 2; + } + if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { + bitrate = Constant.BITRATE; + } else { + bitrate = Integer.parseInt(defaultBitrate) / 2; + } + VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { + @Override + public void onStart() { + progressDialog.show(); + } + + @Override + public void onProgress(float percent) { + progressDialog.setProgress((int) percent); + } + + @Override + public void onFinish(boolean result) { + if (result) { + uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); + } else { + ToastHelper.showToast("压缩失败", ToastHelper.ERROR); + } + progressDialog.dismiss(); + } + }); + } + + /** + * 首次进入页面显示引导Popup + */ + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (isFirstEnter) { + TextView textView = new TextView(this); + int padding = QMUIDisplayHelper.dp2px(this, 10); + textView.setPadding(padding, padding, padding, padding); + textView.setGravity(Gravity.CENTER); + textView.setText("按住即可开始录音"); + QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) + .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) + .view(textView) + .shadow(true) + .arrow(true) + .animStyle(QMUIPopup.ANIM_AUTO) + .dimAmount(0.6f)//60%透明度 + .onDismiss(null) + .show(viewBinding.recodeAudioButton); + isFirstEnter = false; + } + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); + popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); + audioRecodeHelper.startRecordAudio(); + break; + case MotionEvent.ACTION_UP: + audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） + popWindow.dismiss(); + viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); + break; + } + return true; + } + + @Override + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { + viewBinding.caseLargeClassView.setText("无小类"); + } else { + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 + } + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + + viewBinding.caseSmallClassView.setText("请选择"); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { + viewBinding.caseSmallClassView.setText("无小类"); + } else { + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 + } + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void showProgress() { + submitDialog.show(); + } + + @SuppressLint("SetTextI18n") + @Override + public void obtainUploadAudioResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + audioUrl = resultBean.getData(); + /** + * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a + * */ + if (!TextUtils.isEmpty(audioUrl)) { + viewBinding.audioPlayerView.setVisibility(View.VISIBLE); + viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); + } + } + } + + @Override + public void obtainUploadImageResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + /** + * 系统路径static拼接图片返回路径 + * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg + */ + //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg + if (imageAdapter.getItemCount() <= 2) { + String url = resultBean.getData(); + imageList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + imageAdapter.setupImage(realPaths); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } + } + } + + @Override + public void obtainUploadVideoResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 + viewBinding.addVideoView.setVisibility(View.GONE); + viewBinding.videoPlayerView.setVisibility(View.VISIBLE); + videoUrl = resultBean.getData(); + String completeURL = StringHelper.appendCompleteURL(videoUrl); + viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); + //设置第一帧为封面 + Glide.with(context) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(completeURL) + .into(viewBinding.videoPlayerView.posterImageView); + } + } + + /** + * 案卷提交 + */ + private void submitCase() { + String longitude = viewBinding.longitudeView.getText().toString(); + String latitude = viewBinding.latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } + if (eorc.equals("") || typeCode.equals("")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(fieldIntro)) { + ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; + } + String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(description)) { + ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; + } + if (imageAdapter.getItemCount() != 2) { + ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); + return; + } + submitCasePresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, + "2", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); + } + + @Override + public void obtainSubmitResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); + finish(); + } else { + ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ + } + + @Override + public void hideProgress() { + submitDialog.dismiss(); + } + + @Override + protected void onDestroy() { + if (largeClassPresenter != null) { + largeClassPresenter.disposeRetrofitRequest(); + } + if (smallTypePresenter != null) { + smallTypePresenter.disposeRetrofitRequest(); + } + if (submitCasePresenter != null) { + submitCasePresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (uploadAudioPresenter != null) { + uploadAudioPresenter.disposeRetrofitRequest(); + } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } + viewBinding.audioPlayerView.release(); + super.onDestroy(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index a73889b..f4ac608 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -22,11 +22,11 @@ import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseUploadActivity; import com.casic.dcms.ui.CaseUploadPackageActivity; import com.casic.dcms.ui.CaseUploadQuicklyActivity; import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; @@ -121,7 +121,7 @@ Intent intent = new Intent(); switch (itemName) { case "案卷上报": - intent.setClass(context, CaseUploadActivity.class); + intent.setClass(context, CommonCaseUploadActivity.class); break; case "快速上报": intent.setClass(context, CaseUploadQuicklyActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java new file mode 100644 index 0000000..87ee4c3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java @@ -0,0 +1,666 @@ +package com.casic.dcms.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.media.MediaMetadataRetriever; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.TextView; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; +import com.casic.dcms.adapter.NineGridImageAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.databinding.ActivityUploadCommonCaseBinding; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; +import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.utils.AudioRecodeHelper; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.JzExoMedia; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.TimeOrDateUtil; +import com.casic.dcms.utils.ToastHelper; +import com.casic.dcms.widgets.AlertControlDialog; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.entity.LocalMedia; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import com.qmuiteam.qmui.widget.popup.QMUIPopup; +import com.qmuiteam.qmui.widget.popup.QMUIPopups; +import com.zolad.videoslimmer.VideoSlimmer; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cn.jzvd.Jzvd; + +public class CommonCaseUploadActivity extends AndroidxBaseActivity + implements View.OnClickListener, View.OnTouchListener, ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { + + private static final String TAG = "CaseUploadActivity"; + private final Context context = CommonCaseUploadActivity.this; + private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 + private final ArrayList realPaths = new ArrayList<>();//真实图片路径 + private CaseLargeTypePresenterImpl largeClassPresenter; + private CaseSmallTypePresenterImpl smallTypePresenter; + private SubmitCasePresenterImpl submitCasePresenter; + private UploadImagePresenterImpl uploadImagePresenter; + private UploadAudioPresenterImpl uploadAudioPresenter; + private UploadVideoPresenterImpl uploadVideoPresenter; + private List largeTypeBeans; + private List smallTypeBeans; + private QMUITipDialog submitDialog; + private ProgressDialog progressDialog; + private NineGridImageAdapter imageAdapter; + private AudioRecodeHelper audioRecodeHelper; + private PopupWindow popWindow; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 + private String gridId; + private String audioUrl, videoUrl; + private boolean isFirstEnter = true; + + private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + if (result.getResultCode() == Activity.RESULT_OK) { + Intent data = result.getData(); + if (data == null) { + return; + } + double longitude = data.getDoubleExtra("longitude", 0); + double latitude = data.getDoubleExtra("latitude", 0); + gridId = data.getStringExtra("gridId"); + String community = data.getStringExtra("community"); + + viewBinding.longitudeView.setText(String.valueOf(longitude)); + viewBinding.latitudeView.setText(String.valueOf(latitude)); + viewBinding.communityNameView.setText(community); + } + } + }); + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷上报"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + public void initData() { + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); + largeClassPresenter = new CaseLargeTypePresenterImpl(this); + smallTypePresenter = new CaseSmallTypePresenterImpl(this); + submitCasePresenter = new SubmitCasePresenterImpl(this); + submitDialog = new QMUITipDialog.Builder(this) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord("处理中，请稍后") + .create(); + progressDialog = new ProgressDialog(this); + progressDialog.setMessage("视频压缩中..."); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); + progressDialog.setCancelable(false); + progressDialog.setCanceledOnTouchOutside(false); + + uploadImagePresenter = new UploadImagePresenterImpl(this); + uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); + + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + + //图片九宫格 + imageAdapter = new NineGridImageAdapter(this); + viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); + viewBinding.selectedGridViewView.setAdapter(imageAdapter); + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public void initEvent() { + viewBinding.caseClassLayout.setOnClickListener(this); + viewBinding.caseLargeClassLayout.setOnClickListener(this); + viewBinding.caseSmallClassLayout.setOnClickListener(this); + viewBinding.locationMapView.setOnClickListener(this); + viewBinding.addVideoView.setOnClickListener(this); + viewBinding.deleteView.setOnClickListener(this); + viewBinding.submitButton.setOnClickListener(this); + + viewBinding.recodeAudioButton.setOnTouchListener(this); + viewBinding.submitButton.setChangeAlphaWhenPress(true); + //录音相关 + View view = View.inflate(this, R.layout.popu_microphone, null); + int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); + int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); + popWindow = new PopupWindow(view, popWidth, popHeight, true); + popWindow.setAnimationStyle(R.style.PopupAnimation); + ImageView recodeImageView = view.findViewById(R.id.recodeImageView); + TextView recodeTextView = view.findViewById(R.id.recodeTextView); + audioRecodeHelper = new AudioRecodeHelper(); + audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { + @Override + public void onUpdate(double db, long time) { + recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); + recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + } + + @Override + public void onStop(String filePath) { + uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); + } + }); + + //图片九宫格事件处理 + imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { + @Override + public void onAddImageClick() { + new QMUIDialog.MenuDialogBuilder(context) + .addItem("相册中选取", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.selectPicture(CommonCaseUploadActivity.this); + } + }) + .addItem("相机拍照", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.takePicture(CommonCaseUploadActivity.this); + } + }) + .create().show(); + } + + @Override + public void onItemClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); + } + + @Override + public void onItemLongClick(View view, int position) { + imageList.remove(position); + imageAdapter.deleteImage(position); + } + }); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.caseClassLayout) { + new QMUIBottomSheet.BottomListSheetBuilder(this) + .setTitle("案卷类型") + .addItem("事件") + .addItem("部件") + .setGravityCenter(true) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseClassView.setText(tag); + viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷大类 + largeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + } + }).build().show(); + } else if (id == R.id.caseLargeClassLayout) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷大类"); + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseLargeClassView.setText(tag); + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷小类 + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); + eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); + String typeId = dataBean.getId(); + + smallTypePresenter.onReadyRetrofitRequest(eorc, typeId); + } + }).build().show(); + } + } + } else if (id == R.id.caseSmallClassLayout) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷小类"); + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeDetailName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseSmallClassView.setText(tag); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); + } + }).build().show(); + } + } + } else if (id == R.id.locationMapView) { + String type = viewBinding.caseClassView.getText().toString(); + if (type.equals("")) { + ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); + return; + } + Intent intent = new Intent(this, ArcGISMapActivity.class); + intent.putExtra("type", type); + uploadCaseLauncher.launch(intent); + } else if (id == R.id.addVideoView) { + OtherUtils.takeVideo(this); + } else if (id == R.id.deleteView) { + if (viewBinding.videoPlayerView.isShown()) { + new AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("确定重新拍摄视频材料？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + viewBinding.videoPlayerView.setVisibility(View.GONE); + viewBinding.addVideoView.setVisibility(View.VISIBLE); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + } else if (id == R.id.submitButton) { + submitCase(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) { + switch (requestCode) { + case PictureConfig.CHOOSE_REQUEST: + List selectList = PictureSelector.obtainMultipleResult(data); + for (LocalMedia media : selectList) { + File file = new File(media.getCompressPath()); + if (file.length() <= Constant.IMAGE_MINUS_SIZE) { + ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); + continue; + } + uploadImagePresenter.onReadyRetrofitRequest(file); + } + break; + case PictureConfig.REQUEST_CAMERA: + LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); + uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); + break; + case PictureConfig.PREVIEW_VIDEO_CODE: + LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); + //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" + //需要手动压缩视频 + String mediaRealPath = media.getRealPath(); + if (TextUtils.isEmpty(mediaRealPath)) { + //部分手机getRealPath可能为空，需要备用路径 + mediaRealPath = media.getPath(); + } + if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { + //如果默认和备用路径还是为空，则不压缩上传 + ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); + return; + } + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + retriever.setDataSource(mediaRealPath); + String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); + + assert defaultRotation != null; + compressVideo(mediaRealPath, defaultRotation, defaultBitrate); + break; + default: + break; + } + } + } + + /** + * 6.0以上视频压缩 + */ + private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { + Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); + String outputVideoFile = FileUtils.getOutputVideoFile(); + int width, height, bitrate; + if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 + width = Constant.DEFAULT_WIDTH / 2; + height = Constant.DEFAULT_HEIGHT / 2; + } else { + width = Constant.DEFAULT_HEIGHT / 2; + height = Constant.DEFAULT_WIDTH / 2; + } + if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { + bitrate = Constant.BITRATE; + } else { + bitrate = Integer.parseInt(defaultBitrate) / 2; + } + VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { + @Override + public void onStart() { + progressDialog.show(); + } + + @Override + public void onProgress(float percent) { + progressDialog.setProgress((int) percent); + } + + @Override + public void onFinish(boolean result) { + if (result) { + uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); + } else { + ToastHelper.showToast("压缩失败", ToastHelper.ERROR); + } + progressDialog.dismiss(); + } + }); + } + + /** + * 首次进入页面显示引导Popup + */ + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (isFirstEnter) { + TextView textView = new TextView(this); + int padding = QMUIDisplayHelper.dp2px(this, 10); + textView.setPadding(padding, padding, padding, padding); + textView.setGravity(Gravity.CENTER); + textView.setText("按住即可开始录音"); + QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) + .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) + .view(textView) + .shadow(true) + .arrow(true) + .animStyle(QMUIPopup.ANIM_AUTO) + .dimAmount(0.6f)//60%透明度 + .onDismiss(null) + .show(viewBinding.recodeAudioButton); + isFirstEnter = false; + } + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); + popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); + audioRecodeHelper.startRecordAudio(); + break; + case MotionEvent.ACTION_UP: + audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） + popWindow.dismiss(); + viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); + break; + } + return true; + } + + @Override + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { + viewBinding.caseLargeClassView.setText("无小类"); + } else { + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 + } + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + + viewBinding.caseSmallClassView.setText("请选择"); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { + viewBinding.caseSmallClassView.setText("无小类"); + } else { + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 + } + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void showProgress() { + submitDialog.show(); + } + + @SuppressLint("SetTextI18n") + @Override + public void obtainUploadAudioResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + audioUrl = resultBean.getData(); + /** + * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a + * */ + if (!TextUtils.isEmpty(audioUrl)) { + viewBinding.audioPlayerView.setVisibility(View.VISIBLE); + viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); + } + } + } + + @Override + public void obtainUploadImageResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + /** + * 系统路径static拼接图片返回路径 + * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg + */ + //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg + if (imageAdapter.getItemCount() <= 2) { + String url = resultBean.getData(); + imageList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + imageAdapter.setupImage(realPaths); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } + } + } + + @Override + public void obtainUploadVideoResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 + viewBinding.addVideoView.setVisibility(View.GONE); + viewBinding.videoPlayerView.setVisibility(View.VISIBLE); + videoUrl = resultBean.getData(); + String completeURL = StringHelper.appendCompleteURL(videoUrl); + viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); + //设置第一帧为封面 + Glide.with(context) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(completeURL) + .into(viewBinding.videoPlayerView.posterImageView); + } + } + + /** + * 案卷提交 + */ + private void submitCase() { + String longitude = viewBinding.longitudeView.getText().toString(); + String latitude = viewBinding.latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } + if (eorc.equals("") || typeCode.equals("")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(fieldIntro)) { + ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; + } + String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(description)) { + ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; + } + if (imageAdapter.getItemCount() != 2) { + ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); + return; + } + submitCasePresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, + "2", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); + } + + @Override + public void obtainSubmitResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); + finish(); + } else { + ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ + } + + @Override + public void hideProgress() { + submitDialog.dismiss(); + } + + @Override + protected void onDestroy() { + if (largeClassPresenter != null) { + largeClassPresenter.disposeRetrofitRequest(); + } + if (smallTypePresenter != null) { + smallTypePresenter.disposeRetrofitRequest(); + } + if (submitCasePresenter != null) { + submitCasePresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (uploadAudioPresenter != null) { + uploadAudioPresenter.disposeRetrofitRequest(); + } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } + viewBinding.audioPlayerView.release(); + super.onDestroy(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index a73889b..f4ac608 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -22,11 +22,11 @@ import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseUploadActivity; import com.casic.dcms.ui.CaseUploadPackageActivity; import com.casic.dcms.ui.CaseUploadQuicklyActivity; import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; @@ -121,7 +121,7 @@ Intent intent = new Intent(); switch (itemName) { case "案卷上报": - intent.setClass(context, CaseUploadActivity.class); + intent.setClass(context, CommonCaseUploadActivity.class); break; case "快速上报": intent.setClass(context, CaseUploadQuicklyActivity.class); 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 31b7009..28b222a 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 @@ -7,11 +7,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -90,16 +90,16 @@ * 大类列表查询 */ @GET("/case/type/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc); + Observable getCaseLargeType(@Header("token") String token, + @Query("eorc") String eorc); /** * 小类列表查询 */ @GET("/case/typeDetail/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc, - @Query("typeId") String typeId); + Observable getCaseSmallType(@Header("token") String token, + @Query("eorc") String eorc, + @Query("typeId") String typeId); /** * 提交案卷 diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java new file mode 100644 index 0000000..87ee4c3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java @@ -0,0 +1,666 @@ +package com.casic.dcms.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.media.MediaMetadataRetriever; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.TextView; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; +import com.casic.dcms.adapter.NineGridImageAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.databinding.ActivityUploadCommonCaseBinding; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; +import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.utils.AudioRecodeHelper; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.JzExoMedia; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.TimeOrDateUtil; +import com.casic.dcms.utils.ToastHelper; +import com.casic.dcms.widgets.AlertControlDialog; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.entity.LocalMedia; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import com.qmuiteam.qmui.widget.popup.QMUIPopup; +import com.qmuiteam.qmui.widget.popup.QMUIPopups; +import com.zolad.videoslimmer.VideoSlimmer; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cn.jzvd.Jzvd; + +public class CommonCaseUploadActivity extends AndroidxBaseActivity + implements View.OnClickListener, View.OnTouchListener, ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { + + private static final String TAG = "CaseUploadActivity"; + private final Context context = CommonCaseUploadActivity.this; + private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 + private final ArrayList realPaths = new ArrayList<>();//真实图片路径 + private CaseLargeTypePresenterImpl largeClassPresenter; + private CaseSmallTypePresenterImpl smallTypePresenter; + private SubmitCasePresenterImpl submitCasePresenter; + private UploadImagePresenterImpl uploadImagePresenter; + private UploadAudioPresenterImpl uploadAudioPresenter; + private UploadVideoPresenterImpl uploadVideoPresenter; + private List largeTypeBeans; + private List smallTypeBeans; + private QMUITipDialog submitDialog; + private ProgressDialog progressDialog; + private NineGridImageAdapter imageAdapter; + private AudioRecodeHelper audioRecodeHelper; + private PopupWindow popWindow; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 + private String gridId; + private String audioUrl, videoUrl; + private boolean isFirstEnter = true; + + private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + if (result.getResultCode() == Activity.RESULT_OK) { + Intent data = result.getData(); + if (data == null) { + return; + } + double longitude = data.getDoubleExtra("longitude", 0); + double latitude = data.getDoubleExtra("latitude", 0); + gridId = data.getStringExtra("gridId"); + String community = data.getStringExtra("community"); + + viewBinding.longitudeView.setText(String.valueOf(longitude)); + viewBinding.latitudeView.setText(String.valueOf(latitude)); + viewBinding.communityNameView.setText(community); + } + } + }); + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷上报"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + public void initData() { + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); + largeClassPresenter = new CaseLargeTypePresenterImpl(this); + smallTypePresenter = new CaseSmallTypePresenterImpl(this); + submitCasePresenter = new SubmitCasePresenterImpl(this); + submitDialog = new QMUITipDialog.Builder(this) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord("处理中，请稍后") + .create(); + progressDialog = new ProgressDialog(this); + progressDialog.setMessage("视频压缩中..."); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); + progressDialog.setCancelable(false); + progressDialog.setCanceledOnTouchOutside(false); + + uploadImagePresenter = new UploadImagePresenterImpl(this); + uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); + + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + + //图片九宫格 + imageAdapter = new NineGridImageAdapter(this); + viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); + viewBinding.selectedGridViewView.setAdapter(imageAdapter); + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public void initEvent() { + viewBinding.caseClassLayout.setOnClickListener(this); + viewBinding.caseLargeClassLayout.setOnClickListener(this); + viewBinding.caseSmallClassLayout.setOnClickListener(this); + viewBinding.locationMapView.setOnClickListener(this); + viewBinding.addVideoView.setOnClickListener(this); + viewBinding.deleteView.setOnClickListener(this); + viewBinding.submitButton.setOnClickListener(this); + + viewBinding.recodeAudioButton.setOnTouchListener(this); + viewBinding.submitButton.setChangeAlphaWhenPress(true); + //录音相关 + View view = View.inflate(this, R.layout.popu_microphone, null); + int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); + int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); + popWindow = new PopupWindow(view, popWidth, popHeight, true); + popWindow.setAnimationStyle(R.style.PopupAnimation); + ImageView recodeImageView = view.findViewById(R.id.recodeImageView); + TextView recodeTextView = view.findViewById(R.id.recodeTextView); + audioRecodeHelper = new AudioRecodeHelper(); + audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { + @Override + public void onUpdate(double db, long time) { + recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); + recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + } + + @Override + public void onStop(String filePath) { + uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); + } + }); + + //图片九宫格事件处理 + imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { + @Override + public void onAddImageClick() { + new QMUIDialog.MenuDialogBuilder(context) + .addItem("相册中选取", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.selectPicture(CommonCaseUploadActivity.this); + } + }) + .addItem("相机拍照", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.takePicture(CommonCaseUploadActivity.this); + } + }) + .create().show(); + } + + @Override + public void onItemClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); + } + + @Override + public void onItemLongClick(View view, int position) { + imageList.remove(position); + imageAdapter.deleteImage(position); + } + }); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.caseClassLayout) { + new QMUIBottomSheet.BottomListSheetBuilder(this) + .setTitle("案卷类型") + .addItem("事件") + .addItem("部件") + .setGravityCenter(true) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseClassView.setText(tag); + viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷大类 + largeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + } + }).build().show(); + } else if (id == R.id.caseLargeClassLayout) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷大类"); + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseLargeClassView.setText(tag); + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷小类 + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); + eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); + String typeId = dataBean.getId(); + + smallTypePresenter.onReadyRetrofitRequest(eorc, typeId); + } + }).build().show(); + } + } + } else if (id == R.id.caseSmallClassLayout) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷小类"); + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeDetailName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseSmallClassView.setText(tag); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); + } + }).build().show(); + } + } + } else if (id == R.id.locationMapView) { + String type = viewBinding.caseClassView.getText().toString(); + if (type.equals("")) { + ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); + return; + } + Intent intent = new Intent(this, ArcGISMapActivity.class); + intent.putExtra("type", type); + uploadCaseLauncher.launch(intent); + } else if (id == R.id.addVideoView) { + OtherUtils.takeVideo(this); + } else if (id == R.id.deleteView) { + if (viewBinding.videoPlayerView.isShown()) { + new AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("确定重新拍摄视频材料？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + viewBinding.videoPlayerView.setVisibility(View.GONE); + viewBinding.addVideoView.setVisibility(View.VISIBLE); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + } else if (id == R.id.submitButton) { + submitCase(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) { + switch (requestCode) { + case PictureConfig.CHOOSE_REQUEST: + List selectList = PictureSelector.obtainMultipleResult(data); + for (LocalMedia media : selectList) { + File file = new File(media.getCompressPath()); + if (file.length() <= Constant.IMAGE_MINUS_SIZE) { + ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); + continue; + } + uploadImagePresenter.onReadyRetrofitRequest(file); + } + break; + case PictureConfig.REQUEST_CAMERA: + LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); + uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); + break; + case PictureConfig.PREVIEW_VIDEO_CODE: + LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); + //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" + //需要手动压缩视频 + String mediaRealPath = media.getRealPath(); + if (TextUtils.isEmpty(mediaRealPath)) { + //部分手机getRealPath可能为空，需要备用路径 + mediaRealPath = media.getPath(); + } + if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { + //如果默认和备用路径还是为空，则不压缩上传 + ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); + return; + } + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + retriever.setDataSource(mediaRealPath); + String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); + + assert defaultRotation != null; + compressVideo(mediaRealPath, defaultRotation, defaultBitrate); + break; + default: + break; + } + } + } + + /** + * 6.0以上视频压缩 + */ + private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { + Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); + String outputVideoFile = FileUtils.getOutputVideoFile(); + int width, height, bitrate; + if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 + width = Constant.DEFAULT_WIDTH / 2; + height = Constant.DEFAULT_HEIGHT / 2; + } else { + width = Constant.DEFAULT_HEIGHT / 2; + height = Constant.DEFAULT_WIDTH / 2; + } + if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { + bitrate = Constant.BITRATE; + } else { + bitrate = Integer.parseInt(defaultBitrate) / 2; + } + VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { + @Override + public void onStart() { + progressDialog.show(); + } + + @Override + public void onProgress(float percent) { + progressDialog.setProgress((int) percent); + } + + @Override + public void onFinish(boolean result) { + if (result) { + uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); + } else { + ToastHelper.showToast("压缩失败", ToastHelper.ERROR); + } + progressDialog.dismiss(); + } + }); + } + + /** + * 首次进入页面显示引导Popup + */ + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (isFirstEnter) { + TextView textView = new TextView(this); + int padding = QMUIDisplayHelper.dp2px(this, 10); + textView.setPadding(padding, padding, padding, padding); + textView.setGravity(Gravity.CENTER); + textView.setText("按住即可开始录音"); + QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) + .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) + .view(textView) + .shadow(true) + .arrow(true) + .animStyle(QMUIPopup.ANIM_AUTO) + .dimAmount(0.6f)//60%透明度 + .onDismiss(null) + .show(viewBinding.recodeAudioButton); + isFirstEnter = false; + } + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); + popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); + audioRecodeHelper.startRecordAudio(); + break; + case MotionEvent.ACTION_UP: + audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） + popWindow.dismiss(); + viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); + break; + } + return true; + } + + @Override + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { + viewBinding.caseLargeClassView.setText("无小类"); + } else { + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 + } + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + + viewBinding.caseSmallClassView.setText("请选择"); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { + viewBinding.caseSmallClassView.setText("无小类"); + } else { + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 + } + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void showProgress() { + submitDialog.show(); + } + + @SuppressLint("SetTextI18n") + @Override + public void obtainUploadAudioResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + audioUrl = resultBean.getData(); + /** + * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a + * */ + if (!TextUtils.isEmpty(audioUrl)) { + viewBinding.audioPlayerView.setVisibility(View.VISIBLE); + viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); + } + } + } + + @Override + public void obtainUploadImageResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + /** + * 系统路径static拼接图片返回路径 + * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg + */ + //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg + if (imageAdapter.getItemCount() <= 2) { + String url = resultBean.getData(); + imageList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + imageAdapter.setupImage(realPaths); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } + } + } + + @Override + public void obtainUploadVideoResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 + viewBinding.addVideoView.setVisibility(View.GONE); + viewBinding.videoPlayerView.setVisibility(View.VISIBLE); + videoUrl = resultBean.getData(); + String completeURL = StringHelper.appendCompleteURL(videoUrl); + viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); + //设置第一帧为封面 + Glide.with(context) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(completeURL) + .into(viewBinding.videoPlayerView.posterImageView); + } + } + + /** + * 案卷提交 + */ + private void submitCase() { + String longitude = viewBinding.longitudeView.getText().toString(); + String latitude = viewBinding.latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } + if (eorc.equals("") || typeCode.equals("")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(fieldIntro)) { + ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; + } + String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(description)) { + ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; + } + if (imageAdapter.getItemCount() != 2) { + ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); + return; + } + submitCasePresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, + "2", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); + } + + @Override + public void obtainSubmitResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); + finish(); + } else { + ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ + } + + @Override + public void hideProgress() { + submitDialog.dismiss(); + } + + @Override + protected void onDestroy() { + if (largeClassPresenter != null) { + largeClassPresenter.disposeRetrofitRequest(); + } + if (smallTypePresenter != null) { + smallTypePresenter.disposeRetrofitRequest(); + } + if (submitCasePresenter != null) { + submitCasePresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (uploadAudioPresenter != null) { + uploadAudioPresenter.disposeRetrofitRequest(); + } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } + viewBinding.audioPlayerView.release(); + super.onDestroy(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index a73889b..f4ac608 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -22,11 +22,11 @@ import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseUploadActivity; import com.casic.dcms.ui.CaseUploadPackageActivity; import com.casic.dcms.ui.CaseUploadQuicklyActivity; import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; @@ -121,7 +121,7 @@ Intent intent = new Intent(); switch (itemName) { case "案卷上报": - intent.setClass(context, CaseUploadActivity.class); + intent.setClass(context, CommonCaseUploadActivity.class); break; case "快速上报": intent.setClass(context, CaseUploadQuicklyActivity.class); 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 31b7009..28b222a 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 @@ -7,11 +7,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -90,16 +90,16 @@ * 大类列表查询 */ @GET("/case/type/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc); + Observable getCaseLargeType(@Header("token") String token, + @Query("eorc") String eorc); /** * 小类列表查询 */ @GET("/case/typeDetail/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc, - @Query("typeId") String typeId); + Observable getCaseSmallType(@Header("token") String token, + @Query("eorc") String eorc, + @Query("typeId") String typeId); /** * 提交案卷 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 fefc65c..a8b31bb 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 @@ -9,11 +9,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -131,34 +131,34 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String eorc) { + public static Observable getCaseLargeType(String eorc) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainLargeClass(AuthenticationHelper.getToken(), eorc); + return service.getCaseLargeType(AuthenticationHelper.getToken(), eorc); } /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String eorc, String typeId) { + public static Observable getCaseSmallType(String eorc, String typeId) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainLargeClass(AuthenticationHelper.getToken(), eorc, typeId); + return service.getCaseSmallType(AuthenticationHelper.getToken(), eorc, typeId); } /** * 提交案卷 */ - public static Observable getSubmitCaseResult(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, - int bzhours, int bzminis) { + public static Observable submitCase(String isNeedVerify, String isNeedRevisit, + String longitude, String latitude, + String source, String caseLevel, + String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, + String gridId, String description, + String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, @@ -312,7 +312,7 @@ * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ - public static Observable getImageUploadResult(File image) { + public static Observable uploadImage(File image) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("image/png"), image); @@ -323,7 +323,7 @@ /** * 上传案卷音频 */ - public static Observable getAudioUploadResult(File audio) { + public static Observable uploadAudio(File audio) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("audio/m4a"), audio); @@ -334,7 +334,7 @@ /** * 上传案卷视频 */ - public static Observable getVideoUploadResult(File video) { + public static Observable uploadVideo(File video) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("video/mp4"), video); diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java new file mode 100644 index 0000000..87ee4c3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java @@ -0,0 +1,666 @@ +package com.casic.dcms.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.media.MediaMetadataRetriever; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.TextView; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; +import com.casic.dcms.adapter.NineGridImageAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.databinding.ActivityUploadCommonCaseBinding; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; +import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.utils.AudioRecodeHelper; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.JzExoMedia; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.TimeOrDateUtil; +import com.casic.dcms.utils.ToastHelper; +import com.casic.dcms.widgets.AlertControlDialog; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.entity.LocalMedia; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import com.qmuiteam.qmui.widget.popup.QMUIPopup; +import com.qmuiteam.qmui.widget.popup.QMUIPopups; +import com.zolad.videoslimmer.VideoSlimmer; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cn.jzvd.Jzvd; + +public class CommonCaseUploadActivity extends AndroidxBaseActivity + implements View.OnClickListener, View.OnTouchListener, ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { + + private static final String TAG = "CaseUploadActivity"; + private final Context context = CommonCaseUploadActivity.this; + private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 + private final ArrayList realPaths = new ArrayList<>();//真实图片路径 + private CaseLargeTypePresenterImpl largeClassPresenter; + private CaseSmallTypePresenterImpl smallTypePresenter; + private SubmitCasePresenterImpl submitCasePresenter; + private UploadImagePresenterImpl uploadImagePresenter; + private UploadAudioPresenterImpl uploadAudioPresenter; + private UploadVideoPresenterImpl uploadVideoPresenter; + private List largeTypeBeans; + private List smallTypeBeans; + private QMUITipDialog submitDialog; + private ProgressDialog progressDialog; + private NineGridImageAdapter imageAdapter; + private AudioRecodeHelper audioRecodeHelper; + private PopupWindow popWindow; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 + private String gridId; + private String audioUrl, videoUrl; + private boolean isFirstEnter = true; + + private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + if (result.getResultCode() == Activity.RESULT_OK) { + Intent data = result.getData(); + if (data == null) { + return; + } + double longitude = data.getDoubleExtra("longitude", 0); + double latitude = data.getDoubleExtra("latitude", 0); + gridId = data.getStringExtra("gridId"); + String community = data.getStringExtra("community"); + + viewBinding.longitudeView.setText(String.valueOf(longitude)); + viewBinding.latitudeView.setText(String.valueOf(latitude)); + viewBinding.communityNameView.setText(community); + } + } + }); + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷上报"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + public void initData() { + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); + largeClassPresenter = new CaseLargeTypePresenterImpl(this); + smallTypePresenter = new CaseSmallTypePresenterImpl(this); + submitCasePresenter = new SubmitCasePresenterImpl(this); + submitDialog = new QMUITipDialog.Builder(this) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord("处理中，请稍后") + .create(); + progressDialog = new ProgressDialog(this); + progressDialog.setMessage("视频压缩中..."); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); + progressDialog.setCancelable(false); + progressDialog.setCanceledOnTouchOutside(false); + + uploadImagePresenter = new UploadImagePresenterImpl(this); + uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); + + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + + //图片九宫格 + imageAdapter = new NineGridImageAdapter(this); + viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); + viewBinding.selectedGridViewView.setAdapter(imageAdapter); + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public void initEvent() { + viewBinding.caseClassLayout.setOnClickListener(this); + viewBinding.caseLargeClassLayout.setOnClickListener(this); + viewBinding.caseSmallClassLayout.setOnClickListener(this); + viewBinding.locationMapView.setOnClickListener(this); + viewBinding.addVideoView.setOnClickListener(this); + viewBinding.deleteView.setOnClickListener(this); + viewBinding.submitButton.setOnClickListener(this); + + viewBinding.recodeAudioButton.setOnTouchListener(this); + viewBinding.submitButton.setChangeAlphaWhenPress(true); + //录音相关 + View view = View.inflate(this, R.layout.popu_microphone, null); + int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); + int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); + popWindow = new PopupWindow(view, popWidth, popHeight, true); + popWindow.setAnimationStyle(R.style.PopupAnimation); + ImageView recodeImageView = view.findViewById(R.id.recodeImageView); + TextView recodeTextView = view.findViewById(R.id.recodeTextView); + audioRecodeHelper = new AudioRecodeHelper(); + audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { + @Override + public void onUpdate(double db, long time) { + recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); + recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + } + + @Override + public void onStop(String filePath) { + uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); + } + }); + + //图片九宫格事件处理 + imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { + @Override + public void onAddImageClick() { + new QMUIDialog.MenuDialogBuilder(context) + .addItem("相册中选取", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.selectPicture(CommonCaseUploadActivity.this); + } + }) + .addItem("相机拍照", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.takePicture(CommonCaseUploadActivity.this); + } + }) + .create().show(); + } + + @Override + public void onItemClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); + } + + @Override + public void onItemLongClick(View view, int position) { + imageList.remove(position); + imageAdapter.deleteImage(position); + } + }); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.caseClassLayout) { + new QMUIBottomSheet.BottomListSheetBuilder(this) + .setTitle("案卷类型") + .addItem("事件") + .addItem("部件") + .setGravityCenter(true) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseClassView.setText(tag); + viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷大类 + largeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + } + }).build().show(); + } else if (id == R.id.caseLargeClassLayout) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷大类"); + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseLargeClassView.setText(tag); + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷小类 + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); + eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); + String typeId = dataBean.getId(); + + smallTypePresenter.onReadyRetrofitRequest(eorc, typeId); + } + }).build().show(); + } + } + } else if (id == R.id.caseSmallClassLayout) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷小类"); + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeDetailName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseSmallClassView.setText(tag); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); + } + }).build().show(); + } + } + } else if (id == R.id.locationMapView) { + String type = viewBinding.caseClassView.getText().toString(); + if (type.equals("")) { + ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); + return; + } + Intent intent = new Intent(this, ArcGISMapActivity.class); + intent.putExtra("type", type); + uploadCaseLauncher.launch(intent); + } else if (id == R.id.addVideoView) { + OtherUtils.takeVideo(this); + } else if (id == R.id.deleteView) { + if (viewBinding.videoPlayerView.isShown()) { + new AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("确定重新拍摄视频材料？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + viewBinding.videoPlayerView.setVisibility(View.GONE); + viewBinding.addVideoView.setVisibility(View.VISIBLE); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + } else if (id == R.id.submitButton) { + submitCase(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) { + switch (requestCode) { + case PictureConfig.CHOOSE_REQUEST: + List selectList = PictureSelector.obtainMultipleResult(data); + for (LocalMedia media : selectList) { + File file = new File(media.getCompressPath()); + if (file.length() <= Constant.IMAGE_MINUS_SIZE) { + ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); + continue; + } + uploadImagePresenter.onReadyRetrofitRequest(file); + } + break; + case PictureConfig.REQUEST_CAMERA: + LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); + uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); + break; + case PictureConfig.PREVIEW_VIDEO_CODE: + LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); + //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" + //需要手动压缩视频 + String mediaRealPath = media.getRealPath(); + if (TextUtils.isEmpty(mediaRealPath)) { + //部分手机getRealPath可能为空，需要备用路径 + mediaRealPath = media.getPath(); + } + if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { + //如果默认和备用路径还是为空，则不压缩上传 + ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); + return; + } + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + retriever.setDataSource(mediaRealPath); + String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); + + assert defaultRotation != null; + compressVideo(mediaRealPath, defaultRotation, defaultBitrate); + break; + default: + break; + } + } + } + + /** + * 6.0以上视频压缩 + */ + private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { + Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); + String outputVideoFile = FileUtils.getOutputVideoFile(); + int width, height, bitrate; + if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 + width = Constant.DEFAULT_WIDTH / 2; + height = Constant.DEFAULT_HEIGHT / 2; + } else { + width = Constant.DEFAULT_HEIGHT / 2; + height = Constant.DEFAULT_WIDTH / 2; + } + if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { + bitrate = Constant.BITRATE; + } else { + bitrate = Integer.parseInt(defaultBitrate) / 2; + } + VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { + @Override + public void onStart() { + progressDialog.show(); + } + + @Override + public void onProgress(float percent) { + progressDialog.setProgress((int) percent); + } + + @Override + public void onFinish(boolean result) { + if (result) { + uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); + } else { + ToastHelper.showToast("压缩失败", ToastHelper.ERROR); + } + progressDialog.dismiss(); + } + }); + } + + /** + * 首次进入页面显示引导Popup + */ + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (isFirstEnter) { + TextView textView = new TextView(this); + int padding = QMUIDisplayHelper.dp2px(this, 10); + textView.setPadding(padding, padding, padding, padding); + textView.setGravity(Gravity.CENTER); + textView.setText("按住即可开始录音"); + QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) + .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) + .view(textView) + .shadow(true) + .arrow(true) + .animStyle(QMUIPopup.ANIM_AUTO) + .dimAmount(0.6f)//60%透明度 + .onDismiss(null) + .show(viewBinding.recodeAudioButton); + isFirstEnter = false; + } + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); + popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); + audioRecodeHelper.startRecordAudio(); + break; + case MotionEvent.ACTION_UP: + audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） + popWindow.dismiss(); + viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); + break; + } + return true; + } + + @Override + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { + viewBinding.caseLargeClassView.setText("无小类"); + } else { + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 + } + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + + viewBinding.caseSmallClassView.setText("请选择"); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { + viewBinding.caseSmallClassView.setText("无小类"); + } else { + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 + } + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void showProgress() { + submitDialog.show(); + } + + @SuppressLint("SetTextI18n") + @Override + public void obtainUploadAudioResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + audioUrl = resultBean.getData(); + /** + * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a + * */ + if (!TextUtils.isEmpty(audioUrl)) { + viewBinding.audioPlayerView.setVisibility(View.VISIBLE); + viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); + } + } + } + + @Override + public void obtainUploadImageResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + /** + * 系统路径static拼接图片返回路径 + * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg + */ + //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg + if (imageAdapter.getItemCount() <= 2) { + String url = resultBean.getData(); + imageList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + imageAdapter.setupImage(realPaths); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } + } + } + + @Override + public void obtainUploadVideoResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 + viewBinding.addVideoView.setVisibility(View.GONE); + viewBinding.videoPlayerView.setVisibility(View.VISIBLE); + videoUrl = resultBean.getData(); + String completeURL = StringHelper.appendCompleteURL(videoUrl); + viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); + //设置第一帧为封面 + Glide.with(context) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(completeURL) + .into(viewBinding.videoPlayerView.posterImageView); + } + } + + /** + * 案卷提交 + */ + private void submitCase() { + String longitude = viewBinding.longitudeView.getText().toString(); + String latitude = viewBinding.latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } + if (eorc.equals("") || typeCode.equals("")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(fieldIntro)) { + ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; + } + String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(description)) { + ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; + } + if (imageAdapter.getItemCount() != 2) { + ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); + return; + } + submitCasePresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, + "2", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); + } + + @Override + public void obtainSubmitResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); + finish(); + } else { + ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ + } + + @Override + public void hideProgress() { + submitDialog.dismiss(); + } + + @Override + protected void onDestroy() { + if (largeClassPresenter != null) { + largeClassPresenter.disposeRetrofitRequest(); + } + if (smallTypePresenter != null) { + smallTypePresenter.disposeRetrofitRequest(); + } + if (submitCasePresenter != null) { + submitCasePresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (uploadAudioPresenter != null) { + uploadAudioPresenter.disposeRetrofitRequest(); + } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } + viewBinding.audioPlayerView.release(); + super.onDestroy(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index a73889b..f4ac608 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -22,11 +22,11 @@ import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseUploadActivity; import com.casic.dcms.ui.CaseUploadPackageActivity; import com.casic.dcms.ui.CaseUploadQuicklyActivity; import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; @@ -121,7 +121,7 @@ Intent intent = new Intent(); switch (itemName) { case "案卷上报": - intent.setClass(context, CaseUploadActivity.class); + intent.setClass(context, CommonCaseUploadActivity.class); break; case "快速上报": intent.setClass(context, CaseUploadQuicklyActivity.class); 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 31b7009..28b222a 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 @@ -7,11 +7,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -90,16 +90,16 @@ * 大类列表查询 */ @GET("/case/type/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc); + Observable getCaseLargeType(@Header("token") String token, + @Query("eorc") String eorc); /** * 小类列表查询 */ @GET("/case/typeDetail/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc, - @Query("typeId") String typeId); + Observable getCaseSmallType(@Header("token") String token, + @Query("eorc") String eorc, + @Query("typeId") String typeId); /** * 提交案卷 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 fefc65c..a8b31bb 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 @@ -9,11 +9,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -131,34 +131,34 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String eorc) { + public static Observable getCaseLargeType(String eorc) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainLargeClass(AuthenticationHelper.getToken(), eorc); + return service.getCaseLargeType(AuthenticationHelper.getToken(), eorc); } /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String eorc, String typeId) { + public static Observable getCaseSmallType(String eorc, String typeId) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainLargeClass(AuthenticationHelper.getToken(), eorc, typeId); + return service.getCaseSmallType(AuthenticationHelper.getToken(), eorc, typeId); } /** * 提交案卷 */ - public static Observable getSubmitCaseResult(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, - int bzhours, int bzminis) { + public static Observable submitCase(String isNeedVerify, String isNeedRevisit, + String longitude, String latitude, + String source, String caseLevel, + String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, + String gridId, String description, + String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, @@ -312,7 +312,7 @@ * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ - public static Observable getImageUploadResult(File image) { + public static Observable uploadImage(File image) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("image/png"), image); @@ -323,7 +323,7 @@ /** * 上传案卷音频 */ - public static Observable getAudioUploadResult(File audio) { + public static Observable uploadAudio(File audio) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("audio/m4a"), audio); @@ -334,7 +334,7 @@ /** * 上传案卷视频 */ - public static Observable getVideoUploadResult(File video) { + public static Observable uploadVideo(File video) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("video/mp4"), video); diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml deleted file mode 100644 index 2538f75..0000000 --- a/app/src/main/res/layout/activity_upload_case.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 26058ed..b261367 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,8 @@ + + @@ -18,12 +20,8 @@ - - - - @@ -42,7 +40,6 @@ - @@ -75,7 +72,7 @@ - + @@ -94,7 +91,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1eb120f..358d4a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,7 +104,7 @@ android:name=".ui.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private int bjNum; - private String eorc; - private String id; - private String typeCode; - private int typeLevel; - private String typeName; - - public int getBjNum() { - return bjNum; - } - - public void setBjNum(int bjNum) { - this.bjNum = bjNum; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTypeCode() { - return typeCode; - } - - public void setTypeCode(String typeCode) { - this.typeCode = typeCode; - } - - public int getTypeLevel() { - return typeLevel; - } - - public void setTypeLevel(int typeLevel) { - this.typeLevel = typeLevel; - } - - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java new file mode 100644 index 0000000..e6d135d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseLargeTypeBean.java @@ -0,0 +1,101 @@ +package com.casic.dcms.bean; + +import java.util.List; + +public class CaseLargeTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private int bjNum; + private String eorc; + private String id; + private String typeCode; + private int typeLevel; + private String typeName; + + public int getBjNum() { + return bjNum; + } + + public void setBjNum(int bjNum) { + this.bjNum = bjNum; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public int getTypeLevel() { + return typeLevel; + } + + public void setTypeLevel(int typeLevel) { + this.typeLevel = typeLevel; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java deleted file mode 100644 index 463b0a6..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseSmallClassBean.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 11:03 - * @Email: 290677893@qq.com - **/ -public class CaseSmallClassBean { - - private int code; - private String message; - private boolean success; - private List data; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - 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 List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public static class DataBean { - - private String deptId; - private String deptName; - private String eorc; - private int gdHas; - private int gdNum; - private String id; - private int opmap; - private String typeDetailCode; - private String typeDetailName; - private String typeId; - - 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 getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public int getGdHas() { - return gdHas; - } - - public void setGdHas(int gdHas) { - this.gdHas = gdHas; - } - - public int getGdNum() { - return gdNum; - } - - public void setGdNum(int gdNum) { - this.gdNum = gdNum; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getOpmap() { - return opmap; - } - - public void setOpmap(int opmap) { - this.opmap = opmap; - } - - public String getTypeDetailCode() { - return typeDetailCode; - } - - public void setTypeDetailCode(String typeDetailCode) { - this.typeDetailCode = typeDetailCode; - } - - public String getTypeDetailName() { - return typeDetailName; - } - - public void setTypeDetailName(String typeDetailName) { - this.typeDetailName = typeDetailName; - } - - public String getTypeId() { - return typeId; - } - - public void setTypeId(String typeId) { - this.typeId = typeId; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java new file mode 100644 index 0000000..6d0c622 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/CaseSmallTypeBean.java @@ -0,0 +1,142 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 11:03 + * @Email: 290677893@qq.com + **/ +public class CaseSmallTypeBean { + + private int code; + private String message; + private boolean success; + private List data; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + 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 List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + + private String deptId; + private String deptName; + private String eorc; + private int gdHas; + private int gdNum; + private String id; + private int opmap; + private String typeDetailCode; + private String typeDetailName; + private String typeId; + + 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 getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public int getGdHas() { + return gdHas; + } + + public void setGdHas(int gdHas) { + this.gdHas = gdHas; + } + + public int getGdNum() { + return gdNum; + } + + public void setGdNum(int gdNum) { + this.gdNum = gdNum; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getOpmap() { + return opmap; + } + + public void setOpmap(int opmap) { + this.opmap = opmap; + } + + public String getTypeDetailCode() { + return typeDetailCode; + } + + public void setTypeDetailCode(String typeDetailCode) { + this.typeDetailCode = typeDetailCode; + } + + public String getTypeDetailName() { + return typeDetailName; + } + + public void setTypeDetailName(String typeDetailName) { + this.typeDetailName = typeDetailName; + } + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java deleted file mode 100644 index 17fb9d5..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetLargeClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface OnGetLargeClassListener { - void onSuccess(CaseLargeClassBean largeClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java new file mode 100644 index 0000000..37933c6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetLargeTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface OnGetLargeTypeListener { + void onSuccess(CaseLargeTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java deleted file mode 100644 index 6cdf69a..0000000 --- a/app/src/main/java/com/casic/dcms/listener/OnGetSmallClassListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.listener; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface OnGetSmallClassListener { - void onSuccess(CaseSmallClassBean smallClassBean); - - void onFailure(Throwable throwable); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java new file mode 100644 index 0000000..8df2da2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/listener/OnGetSmallTypeListener.java @@ -0,0 +1,9 @@ +package com.casic.dcms.listener; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface OnGetSmallTypeListener { + void onSuccess(CaseSmallTypeBean typeBean); + + void onFailure(Throwable throwable); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java deleted file mode 100644 index 8fbdda8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseLargeClassModel { - Subscription sendLargeClassRequest(String eorc); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java new file mode 100644 index 0000000..fb479fc --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseLargeTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseLargeTypeModel { + Subscription getCaseLargeType(String eorc); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java deleted file mode 100644 index b8cf632..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallClassModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSmallClassModel { - Subscription sendSmallClassRequest(String eorc, String typeId); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java new file mode 100644 index 0000000..9593915 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSmallTypeModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICaseSmallTypeModel { + Subscription getCaseSmallType(String eorc, String typeId); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java deleted file mode 100644 index 250190f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseSubmitModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseSubmitModel { - Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java new file mode 100644 index 0000000..7216777 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitCaseModel.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitCaseModel { + Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java index 5662ad7..7d734f1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -5,5 +5,5 @@ import rx.Subscription; public interface IUploadFileModel { - Subscription sendUploadFileRequest(File file); + Subscription uploadFile(File file); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java deleted file mode 100644 index c53a0b5..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.model.ICaseLargeClassModel; -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 CaseLargeClassModelImpl implements ICaseLargeClassModel { - - private final OnGetLargeClassListener largeClassListener; - - public CaseLargeClassModelImpl(OnGetLargeClassListener listener) { - this.largeClassListener = listener; - } - - /** - * {@link ICaseLargeClassModel} - */ - @Override - public Subscription sendLargeClassRequest(String eorc) { - Observable observable = RetrofitServiceManager.getCaseLargeClass(eorc); - 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) { - largeClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseLargeClassBean largeClassBean) { - if (largeClassBean != null) { - largeClassListener.onSuccess(largeClassBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java new file mode 100644 index 0000000..cf8f35b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseLargeTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.model.ICaseLargeTypeModel; +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 CaseLargeTypeModelImpl implements ICaseLargeTypeModel { + + private final OnGetLargeTypeListener largeTypeListener; + + public CaseLargeTypeModelImpl(OnGetLargeTypeListener listener) { + this.largeTypeListener = listener; + } + + /** + * {@link ICaseLargeTypeModel} + */ + @Override + public Subscription getCaseLargeType(String eorc) { + Observable observable = RetrofitServiceManager.getCaseLargeType(eorc); + 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) { + largeTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseLargeTypeBean typeBean) { + if (typeBean != null) { + largeTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java deleted file mode 100644 index bc440e4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallClassModelImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.model.ICaseSmallClassModel; -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 CaseSmallClassModelImpl implements ICaseSmallClassModel { - - private final OnGetSmallClassListener smallClassListener; - - public CaseSmallClassModelImpl(OnGetSmallClassListener listener) { - this.smallClassListener = listener; - } - - /** - * {@link ICaseSmallClassModel} - */ - @Override - public Subscription sendSmallClassRequest(String eorc, String typeId) { - Observable observable = RetrofitServiceManager.getCaseSmallClass(eorc, typeId); - 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) { - smallClassListener.onFailure(e); - } - } - - @Override - public void onNext(CaseSmallClassBean resultBean) { - if (resultBean != null) { - smallClassListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java new file mode 100644 index 0000000..94c8d89 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSmallTypeModelImpl.java @@ -0,0 +1,49 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.model.ICaseSmallTypeModel; +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 CaseSmallTypeModelImpl implements ICaseSmallTypeModel { + + private final OnGetSmallTypeListener smallTypeListener; + + public CaseSmallTypeModelImpl(OnGetSmallTypeListener listener) { + this.smallTypeListener = listener; + } + + /** + * {@link ICaseSmallTypeModel} + */ + @Override + public Subscription getCaseSmallType(String eorc, String typeId) { + Observable observable = RetrofitServiceManager.getCaseSmallType(eorc, typeId); + 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) { + smallTypeListener.onFailure(e); + } + } + + @Override + public void onNext(CaseSmallTypeBean typeBean) { + if (typeBean != null) { + smallTypeListener.onSuccess(typeBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java deleted file mode 100644 index c35ae44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseSubmitModelImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.model.ICaseSubmitModel; -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 CaseSubmitModelImpl implements ICaseSubmitModel { - - private final OnActionResultListener actionResultListener; - - public CaseSubmitModelImpl(OnActionResultListener listener) { - this.actionResultListener = listener; - } - - /** - * {@link ICaseSubmitModel} - */ - @Override - public Subscription sendCaseSubmitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - Observable observable = RetrofitServiceManager.getSubmitCaseResult(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); - 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) { - actionResultListener.onFailure(e); - } - } - - @Override - public void onNext(ActionResultBean resultBean) { - if (resultBean != null) { - actionResultListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java new file mode 100644 index 0000000..b73b189 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/SubmitCaseModelImpl.java @@ -0,0 +1,51 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.model.ISubmitCaseModel; +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 SubmitCaseModelImpl implements ISubmitCaseModel { + + private final OnActionResultListener actionResultListener; + + public SubmitCaseModelImpl(OnActionResultListener listener) { + this.actionResultListener = listener; + } + + /** + * {@link ISubmitCaseModel} + */ + @Override + public Subscription submitCase(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, String source, String caseLevel, String eorc, String casetypeCode, String casetypeDetailCode, String areaCode, String streetCode, String communityCode, String gridId, String description, String fieldintro, String fileIdVerify, String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + Observable observable = RetrofitServiceManager.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + 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) { + actionResultListener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + actionResultListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java index f7eda87..69b110b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/UploadFileModelImpl.java @@ -25,15 +25,15 @@ * {@link IUploadFileModel} */ @Override - public Subscription sendUploadFileRequest(File file) { + public Subscription uploadFile(File file) { String fileAbsolutePath = file.getAbsolutePath(); Observable observable; if (fileAbsolutePath.endsWith(".m4a")) { - observable = RetrofitServiceManager.getAudioUploadResult(file); + observable = RetrofitServiceManager.uploadAudio(file); } else if (fileAbsolutePath.endsWith(".mp4")) { - observable = RetrofitServiceManager.getVideoUploadResult(file); + observable = RetrofitServiceManager.uploadVideo(file); } else { - observable = RetrofitServiceManager.getImageUploadResult(file); + observable = RetrofitServiceManager.uploadImage(file); } return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java deleted file mode 100644 index eb08b8f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseLargeClassPresenter { - void onReadyRetrofitRequest(String eorc); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java new file mode 100644 index 0000000..b8cc4a1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseLargeTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseLargeTypePresenter { + void onReadyRetrofitRequest(String eorc); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java deleted file mode 100644 index 94afb0e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallClassPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSmallClassPresenter { - void onReadyRetrofitRequest(String eorc, String typeId); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java new file mode 100644 index 0000000..2a472bb --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSmallTypePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICaseSmallTypePresenter { + void onReadyRetrofitRequest(String eorc, String typeId); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java deleted file mode 100644 index fd993c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseSubmitPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java new file mode 100644 index 0000000..7ddf246 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitCasePresenter.java @@ -0,0 +1,12 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java deleted file mode 100644 index 111cd24..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.listener.OnGetLargeClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseLargeClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseLargeClassPresenter; -import com.casic.dcms.mvp.view.ICaseLargeClassView; - -public class CaseLargeClassPresenterImpl extends BasePresenter implements ICaseLargeClassPresenter, OnGetLargeClassListener { - - private final ICaseLargeClassView view; - private final CaseLargeClassModelImpl actionModel; - - public CaseLargeClassPresenterImpl(ICaseLargeClassView caseTypeView) { - this.view = caseTypeView; - actionModel = new CaseLargeClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc) { - addSubscription(actionModel.sendLargeClassRequest(eorc)); - } - - @Override - public void onSuccess(CaseLargeClassBean resultBean) { - view.obtainLargeClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java new file mode 100644 index 0000000..2800f0d --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseLargeTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.listener.OnGetLargeTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseLargeTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseLargeTypePresenter; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; + +public class CaseLargeTypePresenterImpl extends BasePresenter implements ICaseLargeTypePresenter, OnGetLargeTypeListener { + + private final ICaseLargeTypeView view; + private final CaseLargeTypeModelImpl actionModel; + + public CaseLargeTypePresenterImpl(ICaseLargeTypeView largeTypeView) { + this.view = largeTypeView; + actionModel = new CaseLargeTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc) { + addSubscription(actionModel.getCaseLargeType(eorc)); + } + + @Override + public void onSuccess(CaseLargeTypeBean resultBean) { + view.obtainLargeType(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java deleted file mode 100644 index 92ea294..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallClassPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.listener.OnGetSmallClassListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSmallClassModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSmallClassPresenter; -import com.casic.dcms.mvp.view.ICaseSmallClassView; - -public class CaseSmallClassPresenterImpl extends BasePresenter implements ICaseSmallClassPresenter, OnGetSmallClassListener { - - private final ICaseSmallClassView view; - private final CaseSmallClassModelImpl actionModel; - - public CaseSmallClassPresenterImpl(ICaseSmallClassView smallClassView) { - this.view = smallClassView; - actionModel = new CaseSmallClassModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String eorc, String typeId) { - addSubscription(actionModel.sendSmallClassRequest(eorc, typeId)); - } - - @Override - public void onSuccess(CaseSmallClassBean resultBean) { - view.obtainSmallClassData(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java new file mode 100644 index 0000000..0707109 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSmallTypePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.listener.OnGetSmallTypeListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.CaseSmallTypeModelImpl; +import com.casic.dcms.mvp.presenter.ICaseSmallTypePresenter; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; + +public class CaseSmallTypePresenterImpl extends BasePresenter implements ICaseSmallTypePresenter, OnGetSmallTypeListener { + + private final ICaseSmallTypeView view; + private final CaseSmallTypeModelImpl actionModel; + + public CaseSmallTypePresenterImpl(ICaseSmallTypeView smallTypeView) { + this.view = smallTypeView; + actionModel = new CaseSmallTypeModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String eorc, String typeId) { + addSubscription(actionModel.getCaseSmallType(eorc, typeId)); + } + + @Override + public void onSuccess(CaseSmallTypeBean typeBean) { + view.obtainSmallType(typeBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java deleted file mode 100644 index 44d2ff7..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseSubmitPresenterImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.listener.OnActionResultListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseSubmitModelImpl; -import com.casic.dcms.mvp.presenter.ICaseSubmitPresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; - -/** - * @Author: Pengxh - * @Time: 2021/4/12 13:29 - * @Email: 290677893@qq.com - **/ -public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, OnActionResultListener { - - private final ICaseSubmitView view; - private final CaseSubmitModelImpl actionModel; - - public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { - this.view = submitCaseView; - actionModel = new CaseSubmitModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, - String latitude, String source, String caseLevel, String eorc, - String casetypeCode, String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, String gridId, - String description, String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { - view.showProgress(); - addSubscription(actionModel.sendCaseSubmitRequest(isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); - } - - @Override - public void onSuccess(ActionResultBean resultBean) { - view.hideProgress(); - view.obtainSubmitResult(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/impl/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java index 7b36e66..eb42ac7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/ShopCaseSubmitPresenterImpl.java @@ -5,7 +5,7 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.SubmitShopCaseModelImpl; import com.casic.dcms.mvp.presenter.ISubmitShopCasePresenter; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; /** * @Author: Pengxh @@ -15,10 +15,10 @@ public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, OnActionResultListener { - private final ICaseSubmitView view; + private final ISubmitCaseView view; private final SubmitShopCaseModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + public ShopCaseSubmitPresenterImpl(ISubmitCaseView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitShopCaseModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java new file mode 100644 index 0000000..75c0ee2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/SubmitCasePresenterImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.listener.OnActionResultListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.SubmitCaseModelImpl; +import com.casic.dcms.mvp.presenter.ISubmitCasePresenter; +import com.casic.dcms.mvp.view.ISubmitCaseView; + +/** + * @Author: Pengxh + * @Time: 2021/4/12 13:29 + * @Email: 290677893@qq.com + **/ +public class SubmitCasePresenterImpl extends BasePresenter implements ISubmitCasePresenter, OnActionResultListener { + + private final ISubmitCaseView view; + private final SubmitCaseModelImpl actionModel; + + public SubmitCasePresenterImpl(ISubmitCaseView submitCaseView) { + this.view = submitCaseView; + actionModel = new SubmitCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, + String latitude, String source, String caseLevel, String eorc, + String casetypeCode, String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, String gridId, + String description, String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, int bzhours, int bzminis) { + view.showProgress(); + addSubscription(actionModel.submitCase(isNeedVerify, isNeedRevisit, longitude, latitude, + source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, + gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainSubmitResult(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/impl/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java index 3e4760c..029036d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadAudioPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java index 683758b..54f2d0f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadImagePresenterImpl.java @@ -38,7 +38,7 @@ @Override public void onSuccess(File file) { if (file != null) { - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } else { view.obtainDataFail(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java index 7240685..6bf6ef3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/UploadVideoPresenterImpl.java @@ -22,7 +22,7 @@ @Override public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendUploadFileRequest(file)); + addSubscription(actionModel.uploadFile(file)); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java deleted file mode 100644 index 047bfda..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseLargeClassBean; - -public interface ICaseLargeClassView { - void obtainLargeClassData(CaseLargeClassBean largeClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java new file mode 100644 index 0000000..81fc24e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseLargeTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseLargeTypeBean; + +public interface ICaseLargeTypeView { + void obtainLargeType(CaseLargeTypeBean typeBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java deleted file mode 100644 index 61edeaf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallClassView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseSmallClassBean; - -public interface ICaseSmallClassView { - void obtainSmallClassData(CaseSmallClassBean smallClassBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java new file mode 100644 index 0000000..592b702 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSmallTypeView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseSmallTypeBean; + +public interface ICaseSmallTypeView { + void obtainSmallType(CaseSmallTypeBean typeBean); +} 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 deleted file mode 100644 index fee4ef2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java +++ /dev/null @@ -1,13 +0,0 @@ -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/ISubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java new file mode 100644 index 0000000..2ceb337 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitCaseView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ISubmitCaseView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java index 3118cd1..ade2b12 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseSearchActivity.java @@ -8,15 +8,15 @@ import com.casic.dcms.R; import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.databinding.ActivityCaseSearchBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseStatusPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.ICaseStatusView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.TimeOrDateUtil; @@ -28,14 +28,14 @@ import java.util.List; public class CaseSearchActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseStatusView { + ICaseLargeTypeView, ICaseSmallTypeView, ICaseStatusView { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private CaseStatusPresenterImpl caseStatusPresenter; private String eorc = ""; private String typeCode = ""; @@ -50,8 +50,8 @@ @Override public void initData() { - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); caseStatusPresenter = new CaseStatusPresenterImpl(this); } @@ -92,11 +92,11 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -108,7 +108,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); typeCode = dataBean.getTypeCode(); @@ -117,11 +117,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -131,7 +131,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -209,14 +209,14 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); @@ -226,14 +226,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java deleted file mode 100644 index cd9f320..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ /dev/null @@ -1,667 +0,0 @@ -package com.casic.dcms.ui; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.app.ProgressDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.media.MediaMetadataRetriever; -import android.text.TextUtils; -import android.util.Log; -import android.view.Gravity; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.TextView; - -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; -import com.casic.dcms.R; -import com.casic.dcms.adapter.NineGridImageAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; -import com.casic.dcms.databinding.ActivityUploadCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -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; -import com.casic.dcms.utils.FileUtils; -import com.casic.dcms.utils.JzExoMedia; -import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.TimeOrDateUtil; -import com.casic.dcms.utils.ToastHelper; -import com.casic.dcms.widgets.AlertControlDialog; -import com.luck.picture.lib.PictureSelector; -import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.entity.LocalMedia; -import com.qmuiteam.qmui.util.QMUIDisplayHelper; -import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; -import com.qmuiteam.qmui.widget.dialog.QMUIDialog; -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; -import com.qmuiteam.qmui.widget.popup.QMUIPopup; -import com.qmuiteam.qmui.widget.popup.QMUIPopups; -import com.zolad.videoslimmer.VideoSlimmer; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import cn.jzvd.Jzvd; - -public class CaseUploadActivity extends AndroidxBaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { - - private static final String TAG = "CaseUploadActivity"; - private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; - private QMUITipDialog submitDialog; - private ProgressDialog progressDialog; - private UploadImagePresenterImpl uploadImagePresenter; - private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 - private final ArrayList realPaths = new ArrayList<>();//真实图片路径 - private String eorc = ""; - private String typeCode = ""; - private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 - private UploadAudioPresenterImpl uploadAudioPresenter; - private NineGridImageAdapter imageAdapter; - private String gridId; - private UploadVideoPresenterImpl uploadVideoPresenter; - private String audioUrl, videoUrl; - private AudioRecodeHelper audioRecodeHelper; - private PopupWindow popWindow; - private boolean isFirstEnter = true; - - private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { - @Override - public void onActivityResult(ActivityResult result) { - if (result.getResultCode() == Activity.RESULT_OK) { - Intent data = result.getData(); - if (data == null) { - return; - } - double longitude = data.getDoubleExtra("longitude", 0); - double latitude = data.getDoubleExtra("latitude", 0); - gridId = data.getStringExtra("gridId"); - String community = data.getStringExtra("community"); - - viewBinding.longitudeView.setText(String.valueOf(longitude)); - viewBinding.latitudeView.setText(String.valueOf(latitude)); - viewBinding.communityNameView.setText(community); - } - } - }); - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷上报"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); - submitDialog = new QMUITipDialog.Builder(this) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord("处理中，请稍后") - .create(); - progressDialog = new ProgressDialog(this); - progressDialog.setMessage("视频压缩中..."); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); - progressDialog.setCancelable(false); - progressDialog.setCanceledOnTouchOutside(false); - - uploadImagePresenter = new UploadImagePresenterImpl(this); - uploadAudioPresenter = new UploadAudioPresenterImpl(this); - uploadVideoPresenter = new UploadVideoPresenterImpl(this); - - /** - * 计算+图标大小 - * - * CarrView水平外边距5dp - * RelativeLayout水平内边距10dp - * RecyclerView左边距100dp - * */ - int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); - int margins = QMUIDisplayHelper.dp2px(this, 3); - int itemSize = (realWidth - 4 * margins) / 2; - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); - params.setMargins(margins, margins, margins, margins); - params.gravity = Gravity.LEFT; - viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); - viewBinding.addVideoView.setLayoutParams(params); - - //图片九宫格 - imageAdapter = new NineGridImageAdapter(this); - viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); - viewBinding.selectedGridViewView.setAdapter(imageAdapter); - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public void initEvent() { - viewBinding.caseClassLayout.setOnClickListener(this); - viewBinding.caseLargeClassLayout.setOnClickListener(this); - viewBinding.caseSmallClassLayout.setOnClickListener(this); - viewBinding.locationMapView.setOnClickListener(this); - viewBinding.addVideoView.setOnClickListener(this); - viewBinding.deleteView.setOnClickListener(this); - viewBinding.submitButton.setOnClickListener(this); - - viewBinding.recodeAudioButton.setOnTouchListener(this); - viewBinding.submitButton.setChangeAlphaWhenPress(true); - //录音相关 - View view = View.inflate(this, R.layout.popu_microphone, null); - int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); - int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); - popWindow = new PopupWindow(view, popWidth, popHeight, true); - popWindow.setAnimationStyle(R.style.PopupAnimation); - ImageView recodeImageView = view.findViewById(R.id.recodeImageView); - TextView recodeTextView = view.findViewById(R.id.recodeTextView); - audioRecodeHelper = new AudioRecodeHelper(); - audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { - @Override - public void onUpdate(double db, long time) { - recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); - recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); - } - - @Override - public void onStop(String filePath) { - uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); - } - }); - - //图片九宫格事件处理 - imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { - @Override - public void onAddImageClick() { - new QMUIDialog.MenuDialogBuilder(context) - .addItem("相册中选取", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.selectPicture(CaseUploadActivity.this); - } - }) - .addItem("相机拍照", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - OtherUtils.takePicture(CaseUploadActivity.this); - } - }) - .create().show(); - } - - @Override - public void onItemClick(int position) { - OtherUtils.showBigImage(context, position, realPaths); - } - - @Override - public void onItemLongClick(View view, int position) { - imageList.remove(position); - imageAdapter.deleteImage(position); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == R.id.caseClassLayout) { - new QMUIBottomSheet.BottomListSheetBuilder(this) - .setTitle("案卷类型") - .addItem("事件") - .addItem("部件") - .setGravityCenter(true) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷大类 - caseLargeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); - } - }).build().show(); - } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { - sheetBuilder.addItem(dataBean.getTypeName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); - eorc = dataBean.getEorc(); - typeCode = dataBean.getTypeCode(); - String typeId = dataBean.getId(); - - caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); - } - }).build().show(); - } - } - } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); - sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { - sheetBuilder.addItem(dataBean.getTypeDetailName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); - } - }).build().show(); - } - } - } else if (id == R.id.locationMapView) { - String type = viewBinding.caseClassView.getText().toString(); - if (type.equals("")) { - ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); - return; - } - Intent intent = new Intent(this, ArcGISMapActivity.class); - intent.putExtra("type", type); - uploadCaseLauncher.launch(intent); - } else if (id == R.id.addVideoView) { - OtherUtils.takeVideo(this); - } else if (id == R.id.deleteView) { - if (viewBinding.videoPlayerView.isShown()) { - new AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("确定重新拍摄视频材料？") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - viewBinding.videoPlayerView.setVisibility(View.GONE); - viewBinding.addVideoView.setVisibility(View.VISIBLE); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - } else if (id == R.id.submitButton) { - submitCase(); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { - switch (requestCode) { - case PictureConfig.CHOOSE_REQUEST: - List selectList = PictureSelector.obtainMultipleResult(data); - for (LocalMedia media : selectList) { - File file = new File(media.getCompressPath()); - if (file.length() <= Constant.IMAGE_MINUS_SIZE) { - ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); - continue; - } - uploadImagePresenter.onReadyRetrofitRequest(file); - } - break; - case PictureConfig.REQUEST_CAMERA: - LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); - uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); - break; - case PictureConfig.PREVIEW_VIDEO_CODE: - LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); - //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" - //需要手动压缩视频 - String mediaRealPath = media.getRealPath(); - if (TextUtils.isEmpty(mediaRealPath)) { - //部分手机getRealPath可能为空，需要备用路径 - mediaRealPath = media.getPath(); - } - if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { - //如果默认和备用路径还是为空，则不压缩上传 - ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); - return; - } - MediaMetadataRetriever retriever = new MediaMetadataRetriever(); - retriever.setDataSource(mediaRealPath); - String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); - String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); - - assert defaultRotation != null; - compressVideo(mediaRealPath, defaultRotation, defaultBitrate); - break; - default: - break; - } - } - } - - /** - * 6.0以上视频压缩 - */ - private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { - Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); - String outputVideoFile = FileUtils.getOutputVideoFile(); - int width, height, bitrate; - if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 - width = Constant.DEFAULT_WIDTH / 2; - height = Constant.DEFAULT_HEIGHT / 2; - } else { - width = Constant.DEFAULT_HEIGHT / 2; - height = Constant.DEFAULT_WIDTH / 2; - } - if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { - bitrate = Constant.BITRATE; - } else { - bitrate = Integer.parseInt(defaultBitrate) / 2; - } - VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { - @Override - public void onStart() { - progressDialog.show(); - } - - @Override - public void onProgress(float percent) { - progressDialog.setProgress((int) percent); - } - - @Override - public void onFinish(boolean result) { - if (result) { - uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); - } else { - ToastHelper.showToast("压缩失败", ToastHelper.ERROR); - } - progressDialog.dismiss(); - } - }); - } - - /** - * 首次进入页面显示引导Popup - */ - @Override - public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (isFirstEnter) { - TextView textView = new TextView(this); - int padding = QMUIDisplayHelper.dp2px(this, 10); - textView.setPadding(padding, padding, padding, padding); - textView.setGravity(Gravity.CENTER); - textView.setText("按住即可开始录音"); - QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) - .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) - .view(textView) - .shadow(true) - .arrow(true) - .animStyle(QMUIPopup.ANIM_AUTO) - .dimAmount(0.6f)//60%透明度 - .onDismiss(null) - .show(viewBinding.recodeAudioButton); - isFirstEnter = false; - } - } - - @SuppressLint("ClickableViewAccessibility") - @Override - public boolean onTouch(View v, MotionEvent event) { - switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: - viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); - popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); - audioRecodeHelper.startRecordAudio(); - break; - case MotionEvent.ACTION_UP: - audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） - popWindow.dismiss(); - viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); - break; - } - return true; - } - - @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { - //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - - viewBinding.caseSmallClassView.setText("请选择"); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { - //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); - } - } - - @Override - public void showProgress() { - submitDialog.show(); - } - - @SuppressLint("SetTextI18n") - @Override - public void obtainUploadAudioResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - audioUrl = resultBean.getData(); - /** - * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a - * */ - if (!TextUtils.isEmpty(audioUrl)) { - viewBinding.audioPlayerView.setVisibility(View.VISIBLE); - viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); - } - } - } - - @Override - public void obtainUploadImageResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - /** - * 系统路径static拼接图片返回路径 - * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg - */ - //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg - if (imageAdapter.getItemCount() <= 2) { - String url = resultBean.getData(); - imageList.add(url); - realPaths.add(StringHelper.appendCompleteURL(url)); - imageAdapter.setupImage(realPaths); - } else { - ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); - } - } - } - - @Override - public void obtainUploadVideoResult(ActionResultBean resultBean) { - if (resultBean.isSuccess()) { - //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 - viewBinding.addVideoView.setVisibility(View.GONE); - viewBinding.videoPlayerView.setVisibility(View.VISIBLE); - videoUrl = resultBean.getData(); - String completeURL = StringHelper.appendCompleteURL(videoUrl); - viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); - //设置第一帧为封面 - Glide.with(context) - .setDefaultRequestOptions(new RequestOptions().frame(4000000)) - .load(completeURL) - .into(viewBinding.videoPlayerView.posterImageView); - } - } - - /** - * 案卷提交 - */ - private void submitCase() { - String longitude = viewBinding.longitudeView.getText().toString(); - String latitude = viewBinding.latitudeView.getText().toString(); - if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { - ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); - return; - } - if (eorc.equals("") || typeCode.equals("")) { - ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); - return; - } - if (typeDetailCode.equals("")) { - ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); - return; - } - if (TextUtils.isEmpty(gridId)) { - ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); - return; - } - String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(fieldIntro)) { - ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); - return; - } - String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); - if (TextUtils.isEmpty(description)) { - ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); - return; - } - if (imageAdapter.getItemCount() != 2) { - ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); - return; - } - caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", eorc, typeCode, typeDetailCode, - gridId.substring(0, 6), - gridId.substring(0, 9), - gridId.substring(0, 12), - gridId, description, fieldIntro, - StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); - } - - @Override - public void obtainSubmitResult(ActionResultBean resultBean) { -// Log.d(TAG, "obtainSubmitResult: " + gson.toJson(resultBean)); - if (resultBean.isSuccess()) { - ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); - finish(); - } else { - ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); - } - } - - @Override - public void obtainDataFail() { - ToastHelper.showToast("操作失败", ToastHelper.ERROR); - //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ - } - - @Override - public void hideProgress() { - submitDialog.dismiss(); - } - - @Override - protected void onDestroy() { - if (caseLargeClassPresenter != null) { - caseLargeClassPresenter.disposeRetrofitRequest(); - } - if (caseSmallClassPresenter != null) { - caseSmallClassPresenter.disposeRetrofitRequest(); - } - if (caseSubmitPresenter != null) { - caseSubmitPresenter.disposeRetrofitRequest(); - } - if (uploadImagePresenter != null) { - uploadImagePresenter.disposeRetrofitRequest(); - } - if (uploadAudioPresenter != null) { - uploadAudioPresenter.disposeRetrofitRequest(); - } - if (uploadVideoPresenter != null) { - uploadVideoPresenter.disposeRetrofitRequest(); - } - viewBinding.audioPlayerView.release(); - super.onDestroy(); - } - - @Override - public void onBackPressed() { - if (Jzvd.backPress()) { - return; - } - super.onBackPressed(); - } - - @Override - protected void onPause() { - super.onPause(); - Jzvd.releaseAllVideos(); - } -} 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 3fdd8ac..a5810b7 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -22,7 +22,7 @@ import com.casic.dcms.databinding.ActivityUploadPackageBinding; import com.casic.dcms.mvp.presenter.impl.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ICaseSubmitView { +public class CaseUploadPackageActivity extends AndroidxBaseActivity implements IUploadFileView, ISubmitCaseView { private final Context context = this; private UploadImagePresenterImpl uploadImagePresenter; 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 336b17d..f4c184a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -19,16 +19,16 @@ import com.casic.dcms.adapter.NineGridImageAdapter; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseLargeClassBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityUploadCaseQuicklyBinding; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSubmitPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseLargeClassView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -47,14 +47,14 @@ import java.util.List; public class CaseUploadQuicklyActivity extends AndroidxBaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { + ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { private final Context context = this; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private CaseSubmitPresenterImpl caseSubmitPresenter; - private List largeClassBeans; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private SubmitCasePresenterImpl caseSubmitPresenter; + private List largeClassBeans; + private List smallTypeBeans; private QMUITipDialog submitDialog; private UploadImagePresenterImpl uploadImagePresenter; private final ArrayList realPaths = new ArrayList<>();//真是图片路径 @@ -94,10 +94,10 @@ @Override public void initData() { largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); - caseSubmitPresenter = new CaseSubmitPresenterImpl(this); + smallTypeBeans = new ArrayList<>(); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); + caseSubmitPresenter = new SubmitCasePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord("处理中，请稍后") @@ -178,7 +178,7 @@ if (largeClassBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeClassBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -189,7 +189,7 @@ viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeClassBeans.get(position); eorc = dataBean.getEorc(); typeCode = dataBean.getTypeCode(); String typeId = dataBean.getId(); @@ -200,11 +200,11 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @@ -214,7 +214,7 @@ viewBinding.caseSmallClassView.setText(tag); viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); } @@ -261,10 +261,10 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); + this.largeClassBeans = typeBean.getData(); if (largeClassBeans.size() == 0) { viewBinding.caseLargeClassView.setText("无小类"); } else { @@ -278,15 +278,14 @@ } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { -// Log.d(TAG, "obtainSmallClassData: " + new Gson().toJson(smallClassBean)); - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallClassView.setText("无小类"); } else { - viewBinding.caseSmallClassView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 84fb4cd..d7e4692 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -23,21 +23,21 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseDetailBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseNextNodeBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.databinding.ActivityCaseVerifyDetailBinding; import com.casic.dcms.mvp.presenter.impl.CaseDetailPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseLargeClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseNextNodePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseSmallClassPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseDetailHandleView; import com.casic.dcms.mvp.view.ICaseDetailView; -import com.casic.dcms.mvp.view.ICaseLargeClassView; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; import com.casic.dcms.mvp.view.ICaseNextNodeView; -import com.casic.dcms.mvp.view.ICaseSmallClassView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; @@ -61,16 +61,16 @@ import cn.jzvd.Jzvd; public class CaseVerifyDetailActivity extends AndroidxBaseActivity implements ICaseDetailView, View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { + ICaseLargeTypeView, ICaseSmallTypeView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private final Context context = this; + private final Context context = CaseVerifyDetailActivity.this; private final ArrayList realPaths = new ArrayList<>();//真实图片路径 private final List imageList = new ArrayList<>();//上传到服务器的数据集 private CaseDetailPresenterImpl caseDetailPresenter; - private CaseLargeClassPresenterImpl caseLargeClassPresenter; - private List largeClassBeans; - private CaseSmallClassPresenterImpl caseSmallClassPresenter; - private List smallClassBeans; + private CaseLargeTypePresenterImpl caseLargeClassPresenter; + private List largeTypeBeans; + private CaseSmallTypePresenterImpl caseSmallClassPresenter; + private List smallTypeBeans; private String id; private String eorc; private String typeCode; @@ -116,14 +116,14 @@ @Override public void initData() { - largeClassBeans = new ArrayList<>(); - smallClassBeans = new ArrayList<>(); + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); id = getIntent().getStringExtra("id"); caseDetailPresenter = new CaseDetailPresenterImpl(this); caseDetailPresenter.onReadyRetrofitRequest(id); - caseLargeClassPresenter = new CaseLargeClassPresenterImpl(this); - caseSmallClassPresenter = new CaseSmallClassPresenterImpl(this); + caseLargeClassPresenter = new CaseLargeTypePresenterImpl(this); + caseSmallClassPresenter = new CaseSmallTypePresenterImpl(this); uploadImagePresenter = new UploadImagePresenterImpl(this); submitDialog = new QMUITipDialog.Builder(this) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) @@ -281,23 +281,23 @@ } }).build().show(); } else if (id == R.id.caseLargeClassLayout) { - if (largeClassBeans != null) { - if (largeClassBeans.size() > 1) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷大类"); - for (CaseLargeClassBean.DataBean dataBean : largeClassBeans) { + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { sheetBuilder.addItem(dataBean.getTypeName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeCode = largeClassBeans.get(position).getTypeCode(); + typeCode = largeTypeBeans.get(position).getTypeCode(); viewBinding.caseLargeTypeView.setText(tag); //获取案卷小类 - CaseLargeClassBean.DataBean dataBean = largeClassBeans.get(position); + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); eorc = dataBean.getEorc(); String typeId = dataBean.getId(); caseSmallClassPresenter.onReadyRetrofitRequest(eorc, typeId); @@ -306,18 +306,18 @@ } } } else if (id == R.id.caseSmallClassLayout) { - if (smallClassBeans != null) { - if (smallClassBeans.size() > 1) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); sheetBuilder.setTitle("案卷小类"); - for (CaseSmallClassBean.DataBean dataBean : smallClassBeans) { + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { sheetBuilder.addItem(dataBean.getTypeDetailName()); } sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { @Override public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); - typeDetailCode = smallClassBeans.get(position).getTypeDetailCode(); + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); viewBinding.caseSmallTypeView.setText(tag); } @@ -413,28 +413,28 @@ } @Override - public void obtainLargeClassData(CaseLargeClassBean largeClassBean) { - if (largeClassBean.isSuccess()) { + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.largeClassBeans = largeClassBean.getData(); - if (largeClassBeans.size() == 0) { + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { viewBinding.caseLargeTypeView.setText("无小类"); } else { - viewBinding.caseLargeTypeView.setText(largeClassBeans.get(0).getTypeName());//默认选择第一个 + viewBinding.caseLargeTypeView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 } viewBinding.caseSmallTypeView.setText("请选择"); } } @Override - public void obtainSmallClassData(CaseSmallClassBean smallClassBean) { - if (smallClassBean.isSuccess()) { + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { //设置大类数据 - this.smallClassBeans = smallClassBean.getData(); - if (smallClassBeans.size() == 0) { + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { viewBinding.caseSmallTypeView.setText("无小类"); } else { - viewBinding.caseSmallTypeView.setText(smallClassBeans.get(0).getTypeDetailName());//默认选择第一个 + viewBinding.caseSmallTypeView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 } } } diff --git a/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java new file mode 100644 index 0000000..87ee4c3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CommonCaseUploadActivity.java @@ -0,0 +1,666 @@ +package com.casic.dcms.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.ProgressDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.media.MediaMetadataRetriever; +import android.text.TextUtils; +import android.util.Log; +import android.view.Gravity; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupWindow; +import android.widget.TextView; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.casic.dcms.R; +import com.casic.dcms.adapter.NineGridImageAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseLargeTypeBean; +import com.casic.dcms.bean.CaseSmallTypeBean; +import com.casic.dcms.databinding.ActivityUploadCommonCaseBinding; +import com.casic.dcms.mvp.presenter.impl.CaseLargeTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.CaseSmallTypePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.SubmitCasePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadAudioPresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.impl.UploadVideoPresenterImpl; +import com.casic.dcms.mvp.view.ICaseLargeTypeView; +import com.casic.dcms.mvp.view.ICaseSmallTypeView; +import com.casic.dcms.mvp.view.ISubmitCaseView; +import com.casic.dcms.mvp.view.IUploadFileView; +import com.casic.dcms.utils.AudioRecodeHelper; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.FileUtils; +import com.casic.dcms.utils.JzExoMedia; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.TimeOrDateUtil; +import com.casic.dcms.utils.ToastHelper; +import com.casic.dcms.widgets.AlertControlDialog; +import com.luck.picture.lib.PictureSelector; +import com.luck.picture.lib.config.PictureConfig; +import com.luck.picture.lib.entity.LocalMedia; +import com.qmuiteam.qmui.util.QMUIDisplayHelper; +import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import com.qmuiteam.qmui.widget.dialog.QMUIDialog; +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; +import com.qmuiteam.qmui.widget.popup.QMUIPopup; +import com.qmuiteam.qmui.widget.popup.QMUIPopups; +import com.zolad.videoslimmer.VideoSlimmer; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cn.jzvd.Jzvd; + +public class CommonCaseUploadActivity extends AndroidxBaseActivity + implements View.OnClickListener, View.OnTouchListener, ICaseLargeTypeView, ICaseSmallTypeView, ISubmitCaseView, IUploadFileView { + + private static final String TAG = "CaseUploadActivity"; + private final Context context = CommonCaseUploadActivity.this; + private final List imageList = new ArrayList<>();//服务器返回的拍照数据集 + private final ArrayList realPaths = new ArrayList<>();//真实图片路径 + private CaseLargeTypePresenterImpl largeClassPresenter; + private CaseSmallTypePresenterImpl smallTypePresenter; + private SubmitCasePresenterImpl submitCasePresenter; + private UploadImagePresenterImpl uploadImagePresenter; + private UploadAudioPresenterImpl uploadAudioPresenter; + private UploadVideoPresenterImpl uploadVideoPresenter; + private List largeTypeBeans; + private List smallTypeBeans; + private QMUITipDialog submitDialog; + private ProgressDialog progressDialog; + private NineGridImageAdapter imageAdapter; + private AudioRecodeHelper audioRecodeHelper; + private PopupWindow popWindow; + private String eorc = ""; + private String typeCode = ""; + private String typeDetailCode = "";//默认值，防止用户不选择直接跳过 + private String gridId; + private String audioUrl, videoUrl; + private boolean isFirstEnter = true; + + private final ActivityResultLauncher uploadCaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + if (result.getResultCode() == Activity.RESULT_OK) { + Intent data = result.getData(); + if (data == null) { + return; + } + double longitude = data.getDoubleExtra("longitude", 0); + double latitude = data.getDoubleExtra("latitude", 0); + gridId = data.getStringExtra("gridId"); + String community = data.getStringExtra("community"); + + viewBinding.longitudeView.setText(String.valueOf(longitude)); + viewBinding.latitudeView.setText(String.valueOf(latitude)); + viewBinding.communityNameView.setText(community); + } + } + }); + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷上报"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + public void initData() { + largeTypeBeans = new ArrayList<>(); + smallTypeBeans = new ArrayList<>(); + largeClassPresenter = new CaseLargeTypePresenterImpl(this); + smallTypePresenter = new CaseSmallTypePresenterImpl(this); + submitCasePresenter = new SubmitCasePresenterImpl(this); + submitDialog = new QMUITipDialog.Builder(this) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord("处理中，请稍后") + .create(); + progressDialog = new ProgressDialog(this); + progressDialog.setMessage("视频压缩中..."); + progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setProgressDrawable(getResources().getDrawable(R.drawable.bg_progress)); + progressDialog.setCancelable(false); + progressDialog.setCanceledOnTouchOutside(false); + + uploadImagePresenter = new UploadImagePresenterImpl(this); + uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); + + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + + //图片九宫格 + imageAdapter = new NineGridImageAdapter(this); + viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); + viewBinding.selectedGridViewView.setAdapter(imageAdapter); + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public void initEvent() { + viewBinding.caseClassLayout.setOnClickListener(this); + viewBinding.caseLargeClassLayout.setOnClickListener(this); + viewBinding.caseSmallClassLayout.setOnClickListener(this); + viewBinding.locationMapView.setOnClickListener(this); + viewBinding.addVideoView.setOnClickListener(this); + viewBinding.deleteView.setOnClickListener(this); + viewBinding.submitButton.setOnClickListener(this); + + viewBinding.recodeAudioButton.setOnTouchListener(this); + viewBinding.submitButton.setChangeAlphaWhenPress(true); + //录音相关 + View view = View.inflate(this, R.layout.popu_microphone, null); + int popWidth = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.35); + int popHeight = (int) (QMUIDisplayHelper.getScreenWidth(this) * 0.30); + popWindow = new PopupWindow(view, popWidth, popHeight, true); + popWindow.setAnimationStyle(R.style.PopupAnimation); + ImageView recodeImageView = view.findViewById(R.id.recodeImageView); + TextView recodeTextView = view.findViewById(R.id.recodeTextView); + audioRecodeHelper = new AudioRecodeHelper(); + audioRecodeHelper.setOnAudioStatusUpdateListener(new AudioRecodeHelper.OnAudioStatusUpdateListener() { + @Override + public void onUpdate(double db, long time) { + recodeImageView.getDrawable().setLevel((int) (3000 + 6000 * db / 100)); + recodeTextView.setText(TimeOrDateUtil.millsToTime(time)); + } + + @Override + public void onStop(String filePath) { + uploadAudioPresenter.onReadyRetrofitRequest(new File(filePath)); + } + }); + + //图片九宫格事件处理 + imageAdapter.setOnItemClickListener(new NineGridImageAdapter.OnItemClickListener() { + @Override + public void onAddImageClick() { + new QMUIDialog.MenuDialogBuilder(context) + .addItem("相册中选取", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.selectPicture(CommonCaseUploadActivity.this); + } + }) + .addItem("相机拍照", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + OtherUtils.takePicture(CommonCaseUploadActivity.this); + } + }) + .create().show(); + } + + @Override + public void onItemClick(int position) { + OtherUtils.showBigImage(context, position, realPaths); + } + + @Override + public void onItemLongClick(View view, int position) { + imageList.remove(position); + imageAdapter.deleteImage(position); + } + }); + } + + @Override + public void onClick(View v) { + int id = v.getId(); + if (id == R.id.caseClassLayout) { + new QMUIBottomSheet.BottomListSheetBuilder(this) + .setTitle("案卷类型") + .addItem("事件") + .addItem("部件") + .setGravityCenter(true) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseClassView.setText(tag); + viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷大类 + largeClassPresenter.onReadyRetrofitRequest(String.valueOf(position + 1)); + } + }).build().show(); + } else if (id == R.id.caseLargeClassLayout) { + if (largeTypeBeans != null) { + if (largeTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷大类"); + for (CaseLargeTypeBean.DataBean dataBean : largeTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseLargeClassView.setText(tag); + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + //获取案卷小类 + CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); + eorc = dataBean.getEorc(); + typeCode = dataBean.getTypeCode(); + String typeId = dataBean.getId(); + + smallTypePresenter.onReadyRetrofitRequest(eorc, typeId); + } + }).build().show(); + } + } + } else if (id == R.id.caseSmallClassLayout) { + if (smallTypeBeans != null) { + if (smallTypeBeans.size() > 1) { + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(this); + sheetBuilder.setTitle("案卷小类"); + for (CaseSmallTypeBean.DataBean dataBean : smallTypeBeans) { + sheetBuilder.addItem(dataBean.getTypeDetailName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + viewBinding.caseSmallClassView.setText(tag); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.textColor)); + + typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); + } + }).build().show(); + } + } + } else if (id == R.id.locationMapView) { + String type = viewBinding.caseClassView.getText().toString(); + if (type.equals("")) { + ToastHelper.showToast("请先选择案卷类型", ToastHelper.WARING); + return; + } + Intent intent = new Intent(this, ArcGISMapActivity.class); + intent.putExtra("type", type); + uploadCaseLauncher.launch(intent); + } else if (id == R.id.addVideoView) { + OtherUtils.takeVideo(this); + } else if (id == R.id.deleteView) { + if (viewBinding.videoPlayerView.isShown()) { + new AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("确定重新拍摄视频材料？") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + viewBinding.videoPlayerView.setVisibility(View.GONE); + viewBinding.addVideoView.setVisibility(View.VISIBLE); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + } else if (id == R.id.submitButton) { + submitCase(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) { + switch (requestCode) { + case PictureConfig.CHOOSE_REQUEST: + List selectList = PictureSelector.obtainMultipleResult(data); + for (LocalMedia media : selectList) { + File file = new File(media.getCompressPath()); + if (file.length() <= Constant.IMAGE_MINUS_SIZE) { + ToastHelper.showToast("图片尺寸太小，请重新选择", ToastHelper.ERROR); + continue; + } + uploadImagePresenter.onReadyRetrofitRequest(file); + } + break; + case PictureConfig.REQUEST_CAMERA: + LocalMedia localMedia = PictureSelector.obtainMultipleResult(data).get(0); + uploadImagePresenter.onReadyRetrofitRequest(new File(localMedia.getCompressPath())); + break; + case PictureConfig.PREVIEW_VIDEO_CODE: + LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0); + //"realPath":"/storage/emulated/0/Movies/VID_20210426_17552226.mp4" + //需要手动压缩视频 + String mediaRealPath = media.getRealPath(); + if (TextUtils.isEmpty(mediaRealPath)) { + //部分手机getRealPath可能为空，需要备用路径 + mediaRealPath = media.getPath(); + } + if (TextUtils.isEmpty(mediaRealPath) || mediaRealPath.equals("")) { + //如果默认和备用路径还是为空，则不压缩上传 + ToastHelper.showToast("操作失败，无法获取有效的视频文件", ToastHelper.ERROR); + return; + } + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + retriever.setDataSource(mediaRealPath); + String defaultRotation = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION); + String defaultBitrate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE); + + assert defaultRotation != null; + compressVideo(mediaRealPath, defaultRotation, defaultBitrate); + break; + default: + break; + } + } + } + + /** + * 6.0以上视频压缩 + */ + private void compressVideo(String mediaRealPath, String defaultRotation, String defaultBitrate) { + Log.d(TAG, "defaultRotation: " + defaultRotation + ", defaultBitrate: " + defaultBitrate); + String outputVideoFile = FileUtils.getOutputVideoFile(); + int width, height, bitrate; + if (defaultRotation.equals("90")) {//视频为竖屏，0为横屏 + width = Constant.DEFAULT_WIDTH / 2; + height = Constant.DEFAULT_HEIGHT / 2; + } else { + width = Constant.DEFAULT_HEIGHT / 2; + height = Constant.DEFAULT_WIDTH / 2; + } + if (TextUtils.isEmpty(defaultBitrate) || defaultBitrate.equals("")) { + bitrate = Constant.BITRATE; + } else { + bitrate = Integer.parseInt(defaultBitrate) / 2; + } + VideoSlimmer.convertVideo(mediaRealPath, outputVideoFile, width, height, Constant.BITRATE, new VideoSlimmer.ProgressListener() { + @Override + public void onStart() { + progressDialog.show(); + } + + @Override + public void onProgress(float percent) { + progressDialog.setProgress((int) percent); + } + + @Override + public void onFinish(boolean result) { + if (result) { + uploadVideoPresenter.onReadyRetrofitRequest(new File(outputVideoFile)); + } else { + ToastHelper.showToast("压缩失败", ToastHelper.ERROR); + } + progressDialog.dismiss(); + } + }); + } + + /** + * 首次进入页面显示引导Popup + */ + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (isFirstEnter) { + TextView textView = new TextView(this); + int padding = QMUIDisplayHelper.dp2px(this, 10); + textView.setPadding(padding, padding, padding, padding); + textView.setGravity(Gravity.CENTER); + textView.setText("按住即可开始录音"); + QMUIPopups.popup(this, QMUIDisplayHelper.dp2px(this, 150)) + .preferredDirection(QMUIPopup.DIRECTION_BOTTOM) + .view(textView) + .shadow(true) + .arrow(true) + .animStyle(QMUIPopup.ANIM_AUTO) + .dimAmount(0.6f)//60%透明度 + .onDismiss(null) + .show(viewBinding.recodeAudioButton); + isFirstEnter = false; + } + } + + @SuppressLint("ClickableViewAccessibility") + @Override + public boolean onTouch(View v, MotionEvent event) { + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + viewBinding.recodeAudioButton.animate().scaleX(0.75f).scaleY(0.75f).setDuration(100).start(); + popWindow.showAtLocation(viewBinding.caseLayout, Gravity.CENTER, 0, 0); + audioRecodeHelper.startRecordAudio(); + break; + case MotionEvent.ACTION_UP: + audioRecodeHelper.stopRecordAudio();//结束录音（保存录音文件） + popWindow.dismiss(); + viewBinding.recodeAudioButton.animate().scaleX(1.0f).scaleY(1.0f).setDuration(100).start(); + break; + } + return true; + } + + @Override + public void obtainLargeType(CaseLargeTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.largeTypeBeans = typeBean.getData(); + if (largeTypeBeans.size() == 0) { + viewBinding.caseLargeClassView.setText("无小类"); + } else { + viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 + } + viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + + viewBinding.caseSmallClassView.setText("请选择"); + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void obtainSmallType(CaseSmallTypeBean typeBean) { + if (typeBean.isSuccess()) { + //设置大类数据 + this.smallTypeBeans = typeBean.getData(); + if (smallTypeBeans.size() == 0) { + viewBinding.caseSmallClassView.setText("无小类"); + } else { + viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 + } + viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(this, R.color.darkGray)); + } + } + + @Override + public void showProgress() { + submitDialog.show(); + } + + @SuppressLint("SetTextI18n") + @Override + public void obtainUploadAudioResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + audioUrl = resultBean.getData(); + /** + * http://111.198.10.15:11409/static/2021-04/8fb86dae39ad4f949e934e25465d7382.m4a + * */ + if (!TextUtils.isEmpty(audioUrl)) { + viewBinding.audioPlayerView.setVisibility(View.VISIBLE); + viewBinding.audioPlayerView.setAudioUrl(StringHelper.appendCompleteURL(audioUrl)); + } + } + } + + @Override + public void obtainUploadImageResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + /** + * 系统路径static拼接图片返回路径 + * http://111.198.10.15:11409/static/2021-04/000bcf78345f4c1c86484efa3f9d68a2.jpeg + */ + //2021-04\\000bcf78345f4c1c86484efa3f9d68a2.jpeg + if (imageAdapter.getItemCount() <= 2) { + String url = resultBean.getData(); + imageList.add(url); + realPaths.add(StringHelper.appendCompleteURL(url)); + imageAdapter.setupImage(realPaths); + } else { + ToastHelper.showToast("最多只能上传2张图片", ToastHelper.WARING); + } + } + } + + @Override + public void obtainUploadVideoResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //2021-04\\9d89df21173043cfb4188e68613e3e0e.mp4 + viewBinding.addVideoView.setVisibility(View.GONE); + viewBinding.videoPlayerView.setVisibility(View.VISIBLE); + videoUrl = resultBean.getData(); + String completeURL = StringHelper.appendCompleteURL(videoUrl); + viewBinding.videoPlayerView.setUp(completeURL, "", Jzvd.SCREEN_NORMAL, JzExoMedia.class); + //设置第一帧为封面 + Glide.with(context) + .setDefaultRequestOptions(new RequestOptions().frame(4000000)) + .load(completeURL) + .into(viewBinding.videoPlayerView.posterImageView); + } + } + + /** + * 案卷提交 + */ + private void submitCase() { + String longitude = viewBinding.longitudeView.getText().toString(); + String latitude = viewBinding.latitudeView.getText().toString(); + if (longitude.equals("0") || latitude.equals("0") || TextUtils.isEmpty(longitude) || TextUtils.isEmpty(latitude)) { + ToastHelper.showToast("经纬度异常，请重新选择位置", ToastHelper.WARING); + return; + } + if (eorc.equals("") || typeCode.equals("")) { + ToastHelper.showToast("案卷大类还未选择", ToastHelper.WARING); + return; + } + if (typeDetailCode.equals("")) { + ToastHelper.showToast("案卷小类还未选择", ToastHelper.WARING); + return; + } + if (TextUtils.isEmpty(gridId)) { + ToastHelper.showToast("网格ID异常，请重新地图选点", ToastHelper.WARING); + return; + } + String fieldIntro = viewBinding.caseLocationView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(fieldIntro)) { + ToastHelper.showToast("案卷地点还未填写", ToastHelper.WARING); + return; + } + String description = viewBinding.caseDetailEditView.getText().toString().trim().replace(" ", ""); + if (TextUtils.isEmpty(description)) { + ToastHelper.showToast("案卷情况还未填写", ToastHelper.WARING); + return; + } + if (imageAdapter.getItemCount() != 2) { + ToastHelper.showToast("必须选择两张图片", ToastHelper.WARING); + return; + } + submitCasePresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, + "2", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, + StringHelper.reformatURL(imageList), audioUrl, videoUrl, 0, 0); + } + + @Override + public void obtainSubmitResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + ToastHelper.showToast("案卷提交成功", ToastHelper.SUCCESS); + finish(); + } else { + ToastHelper.showToast("案卷提交失败，请重试", ToastHelper.ERROR); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + //TODO 案卷如果在网络极差的情况下，提交超时导致失败了，需要保存到本地吗？等下次打开的是时候提醒用户补提交之前没提交成功的案卷？ + } + + @Override + public void hideProgress() { + submitDialog.dismiss(); + } + + @Override + protected void onDestroy() { + if (largeClassPresenter != null) { + largeClassPresenter.disposeRetrofitRequest(); + } + if (smallTypePresenter != null) { + smallTypePresenter.disposeRetrofitRequest(); + } + if (submitCasePresenter != null) { + submitCasePresenter.disposeRetrofitRequest(); + } + if (uploadImagePresenter != null) { + uploadImagePresenter.disposeRetrofitRequest(); + } + if (uploadAudioPresenter != null) { + uploadAudioPresenter.disposeRetrofitRequest(); + } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } + viewBinding.audioPlayerView.release(); + super.onDestroy(); + } + + @Override + public void onBackPressed() { + if (Jzvd.backPress()) { + return; + } + super.onBackPressed(); + } + + @Override + protected void onPause() { + super.onPause(); + Jzvd.releaseAllVideos(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index a73889b..f4ac608 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -22,11 +22,11 @@ import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseUploadActivity; import com.casic.dcms.ui.CaseUploadPackageActivity; import com.casic.dcms.ui.CaseUploadQuicklyActivity; import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; import com.casic.dcms.ui.OvertimeCaseActivity; @@ -121,7 +121,7 @@ Intent intent = new Intent(); switch (itemName) { case "案卷上报": - intent.setClass(context, CaseUploadActivity.class); + intent.setClass(context, CommonCaseUploadActivity.class); break; case "快速上报": intent.setClass(context, CaseUploadQuicklyActivity.class); 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 31b7009..28b222a 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 @@ -7,11 +7,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -90,16 +90,16 @@ * 大类列表查询 */ @GET("/case/type/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc); + Observable getCaseLargeType(@Header("token") String token, + @Query("eorc") String eorc); /** * 小类列表查询 */ @GET("/case/typeDetail/list") - Observable obtainLargeClass(@Header("token") String token, - @Query("eorc") String eorc, - @Query("typeId") String typeId); + Observable getCaseSmallType(@Header("token") String token, + @Query("eorc") String eorc, + @Query("typeId") String typeId); /** * 提交案卷 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 fefc65c..a8b31bb 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 @@ -9,11 +9,11 @@ import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.bean.CaseLargeClassBean; +import com.casic.dcms.bean.CaseLargeTypeBean; import com.casic.dcms.bean.CaseListResultBean; import com.casic.dcms.bean.CaseNextNodeBean; import com.casic.dcms.bean.CaseProcessBean; -import com.casic.dcms.bean.CaseSmallClassBean; +import com.casic.dcms.bean.CaseSmallTypeBean; import com.casic.dcms.bean.CaseStatusBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; @@ -131,34 +131,34 @@ /** * 大类列表查询 */ - public static Observable getCaseLargeClass(String eorc) { + public static Observable getCaseLargeType(String eorc) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainLargeClass(AuthenticationHelper.getToken(), eorc); + return service.getCaseLargeType(AuthenticationHelper.getToken(), eorc); } /** * 大类列表查询 */ - public static Observable getCaseSmallClass(String eorc, String typeId) { + public static Observable getCaseSmallType(String eorc, String typeId) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainLargeClass(AuthenticationHelper.getToken(), eorc, typeId); + return service.getCaseSmallType(AuthenticationHelper.getToken(), eorc, typeId); } /** * 提交案卷 */ - public static Observable getSubmitCaseResult(String isNeedVerify, String isNeedRevisit, - String longitude, String latitude, - String source, String caseLevel, - String eorc, String casetypeCode, - String casetypeDetailCode, String areaCode, - String streetCode, String communityCode, - String gridId, String description, - String fieldintro, String fileIdVerify, - String audioIdVerify, String videoIdVerify, - int bzhours, int bzminis) { + public static Observable submitCase(String isNeedVerify, String isNeedRevisit, + String longitude, String latitude, + String source, String caseLevel, + String eorc, String casetypeCode, + String casetypeDetailCode, String areaCode, + String streetCode, String communityCode, + String gridId, String description, + String fieldintro, String fileIdVerify, + String audioIdVerify, String videoIdVerify, + int bzhours, int bzminis) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, @@ -312,7 +312,7 @@ * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ - public static Observable getImageUploadResult(File image) { + public static Observable uploadImage(File image) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("image/png"), image); @@ -323,7 +323,7 @@ /** * 上传案卷音频 */ - public static Observable getAudioUploadResult(File audio) { + public static Observable uploadAudio(File audio) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("audio/m4a"), audio); @@ -334,7 +334,7 @@ /** * 上传案卷视频 */ - public static Observable getVideoUploadResult(File video) { + public static Observable uploadVideo(File video) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("video/mp4"), video); diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml deleted file mode 100644 index 2538f75..0000000 --- a/app/src/main/res/layout/activity_upload_case.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_common_case.xml b/app/src/main/res/layout/activity_upload_common_case.xml new file mode 100644 index 0000000..2538f75 --- /dev/null +++ b/app/src/main/res/layout/activity_upload_common_case.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file