diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 6dfff75..5bb9d74 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.ImageRecycleViewAdapter; import com.casic.dcms.base.BaseActivity; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.IUploadImageView; import com.casic.dcms.utils.Constant; @@ -224,7 +224,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); /** diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 6dfff75..5bb9d74 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.ImageRecycleViewAdapter; import com.casic.dcms.base.BaseActivity; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.IUploadImageView; import com.casic.dcms.utils.Constant; @@ -224,7 +224,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); /** diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 6c7a6fa..994de29 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -33,4 +33,12 @@ } return dir.toString(); } + + public static String getVideoCompressPath() { + File dir = new File(Environment.getExternalStorageDirectory(), "VideoFile"); + if (!dir.exists()) { + dir.mkdir(); + } + return dir.toString(); + } } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 6dfff75..5bb9d74 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.ImageRecycleViewAdapter; import com.casic.dcms.base.BaseActivity; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.IUploadImageView; import com.casic.dcms.utils.Constant; @@ -224,7 +224,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); /** diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 6c7a6fa..994de29 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -33,4 +33,12 @@ } return dir.toString(); } + + public static String getVideoCompressPath() { + File dir = new File(Environment.getExternalStorageDirectory(), "VideoFile"); + if (!dir.exists()) { + dir.mkdir(); + } + return dir.toString(); + } } 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 14122ce..f505301 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 @@ -18,8 +18,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import okhttp3.MultipartBody; @@ -230,14 +229,22 @@ */ @Multipart @POST("/fileUpload") - Observable uploadImage(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadImage(@Header("token") String token, + @Part MultipartBody.Part file); /** * 上传案卷音频 */ @Multipart @POST("/fileUpload") - Observable uploadAudio(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadAudio(@Header("token") String token, + @Part MultipartBody.Part file); + + /** + * 上传案卷视频 + */ + @Multipart + @POST("/fileUpload") + Observable uploadVideo(@Header("token") String token, + @Part MultipartBody.Part file); } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 6dfff75..5bb9d74 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.ImageRecycleViewAdapter; import com.casic.dcms.base.BaseActivity; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.IUploadImageView; import com.casic.dcms.utils.Constant; @@ -224,7 +224,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); /** diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 6c7a6fa..994de29 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -33,4 +33,12 @@ } return dir.toString(); } + + public static String getVideoCompressPath() { + File dir = new File(Environment.getExternalStorageDirectory(), "VideoFile"); + if (!dir.exists()) { + dir.mkdir(); + } + return dir.toString(); + } } 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 14122ce..f505301 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 @@ -18,8 +18,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import okhttp3.MultipartBody; @@ -230,14 +229,22 @@ */ @Multipart @POST("/fileUpload") - Observable uploadImage(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadImage(@Header("token") String token, + @Part MultipartBody.Part file); /** * 上传案卷音频 */ @Multipart @POST("/fileUpload") - Observable uploadAudio(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadAudio(@Header("token") String token, + @Part MultipartBody.Part file); + + /** + * 上传案卷视频 + */ + @Multipart + @POST("/fileUpload") + Observable uploadVideo(@Header("token") String token, + @Part MultipartBody.Part file); } 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 43a31a5..01ad905 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 @@ -20,8 +20,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; @@ -280,7 +279,7 @@ * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ - public static Observable getImageUploadResult(File image) { + public static Observable getImageUploadResult(File image) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("image/png"), image); @@ -291,11 +290,22 @@ /** * 上传案卷音频 */ - public static Observable getAudioUploadResult(File audio) { + public static Observable getAudioUploadResult(File audio) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("audio/m4a"), audio); MultipartBody.Part imagePart = MultipartBody.Part.createFormData("file", audio.getName(), requestBody); return service.uploadAudio(TokenHelper.getToken(), imagePart); } + + /** + * 上传案卷视频 + */ + public static Observable getVideoUploadResult(File video) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + RequestBody requestBody = RequestBody.create(MediaType.parse("video/mp4"), video); + MultipartBody.Part imagePart = MultipartBody.Part.createFormData("file", video.getName(), requestBody); + return service.uploadVideo(TokenHelper.getToken(), imagePart); + } } diff --git a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java deleted file mode 100644 index 8b2e11e..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadAudioResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadAudioResultBean { - - /** - * code : 200.0 - * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java deleted file mode 100644 index ec37400..0000000 --- a/app/src/main/java/com/casic/dcms/bean/UploadImageResultBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.casic.dcms.bean; - -public class UploadImageResultBean { - - /** - * code : 200.0 - * data : 2021-04\000bcf78345f4c1c86484efa3f9d68a2.jpeg - * message : 请求成功 - * success : true - */ - - private double code; - private String data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java new file mode 100644 index 0000000..ec8b1a2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/UploadResultBean.java @@ -0,0 +1,48 @@ +package com.casic.dcms.bean; + +public class UploadResultBean { + + /** + * code : 200.0 + * data : 2021-04\eaed5a1c6bdb40b99dff47aacb794c6e.m4a + * message : 请求成功 + * success : true + */ + + private double code; + private String data; + private String message; + private boolean success; + + public double getCode() { + return code; + } + + public void setCode(double code) { + this.code = code; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java deleted file mode 100644 index 99700bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadAudioModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadAudioModel { - Subscription sendRetrofitRequest(File audio); -} 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 new file mode 100644 index 0000000..bd5a506 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IUploadFileModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.io.File; + +import rx.Subscription; + +public interface IUploadFileModel { + Subscription sendRetrofitRequest(File file); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java deleted file mode 100644 index 4e7a37e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IUploadImageModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.model; - -import java.io.File; - -import rx.Subscription; - -public interface IUploadImageModel { - Subscription sendRetrofitRequest(File image); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java index d2964a1..8373d6e 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadAudioModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadAudioModelImpl implements IUploadAudioModel { +public class UploadAudioModelImpl implements IUploadFileModel { private OnUploadAudioListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadAudioListener { - void onSuccess(UploadAudioResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File audio) { - Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 6dfff75..5bb9d74 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.ImageRecycleViewAdapter; import com.casic.dcms.base.BaseActivity; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.IUploadImageView; import com.casic.dcms.utils.Constant; @@ -224,7 +224,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); /** diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 6c7a6fa..994de29 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -33,4 +33,12 @@ } return dir.toString(); } + + public static String getVideoCompressPath() { + File dir = new File(Environment.getExternalStorageDirectory(), "VideoFile"); + if (!dir.exists()) { + dir.mkdir(); + } + return dir.toString(); + } } 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 14122ce..f505301 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 @@ -18,8 +18,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import okhttp3.MultipartBody; @@ -230,14 +229,22 @@ */ @Multipart @POST("/fileUpload") - Observable uploadImage(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadImage(@Header("token") String token, + @Part MultipartBody.Part file); /** * 上传案卷音频 */ @Multipart @POST("/fileUpload") - Observable uploadAudio(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadAudio(@Header("token") String token, + @Part MultipartBody.Part file); + + /** + * 上传案卷视频 + */ + @Multipart + @POST("/fileUpload") + Observable uploadVideo(@Header("token") String token, + @Part MultipartBody.Part file); } 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 43a31a5..01ad905 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 @@ -20,8 +20,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; @@ -280,7 +279,7 @@ * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ - public static Observable getImageUploadResult(File image) { + public static Observable getImageUploadResult(File image) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("image/png"), image); @@ -291,11 +290,22 @@ /** * 上传案卷音频 */ - public static Observable getAudioUploadResult(File audio) { + public static Observable getAudioUploadResult(File audio) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("audio/m4a"), audio); MultipartBody.Part imagePart = MultipartBody.Part.createFormData("file", audio.getName(), requestBody); return service.uploadAudio(TokenHelper.getToken(), imagePart); } + + /** + * 上传案卷视频 + */ + public static Observable getVideoUploadResult(File video) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + RequestBody requestBody = RequestBody.create(MediaType.parse("video/mp4"), video); + MultipartBody.Part imagePart = MultipartBody.Part.createFormData("file", video.getName(), requestBody); + return service.uploadVideo(TokenHelper.getToken(), imagePart); + } } diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5f49244..dde439c 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -249,22 +249,37 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:layout_toStartOf="@id/voiceView" android:background="@drawable/bg_layout" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" - android:padding="3dp" /> + android:paddingHorizontal="3dp" + android:paddingVertical="5dp" /> + + + + + + + + android:paddingHorizontal="30dp" + android:paddingVertical="5dp" + android:text="1''" + android:visibility="visible" /> @@ -295,11 +311,16 @@ android:layout_marginEnd="10dp" android:orientation="vertical"> + + observable = RetrofitServiceManager.getAudioUploadResult(audio); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getAudioUploadResult(audio); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadAudioResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java index 159bea1..6356ab8 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadImageModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import java.io.File; @@ -11,7 +11,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class UploadImageModelImpl implements IUploadImageModel { +public class UploadImageModelImpl implements IUploadFileModel { private OnUploadImageListener listener; @@ -23,7 +23,7 @@ * 数据回调接口 */ public interface OnUploadImageListener { - void onSuccess(UploadImageResultBean resultBean); + void onSuccess(UploadResultBean resultBean); void onFailure(Throwable throwable); } @@ -31,8 +31,8 @@ @Override public Subscription sendRetrofitRequest(File image) { - Observable observable = RetrofitServiceManager.getImageUploadResult(image); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getImageUploadResult(image); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -46,7 +46,7 @@ } @Override - public void onNext(UploadImageResultBean resultBean) { + public void onNext(UploadResultBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java new file mode 100644 index 0000000..15add25 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/UploadVideoModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.io.File; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class UploadVideoModelImpl implements IUploadFileModel { + + private OnUploadVideoListener listener; + + public UploadVideoModelImpl(OnUploadVideoListener uploadVideoListener) { + this.listener = uploadVideoListener; + } + + /** + * 数据回调接口 + */ + public interface OnUploadVideoListener { + void onSuccess(UploadResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(File file) { + Observable observable = RetrofitServiceManager.getVideoUploadResult(file); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (listener != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(UploadResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java deleted file mode 100644 index 8a20229..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadAudioPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadAudioPresenter { - void onReadyRetrofitRequest(File audio); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java new file mode 100644 index 0000000..90327d3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadFilePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.io.File; + +public interface IUploadFilePresenter { + void onReadyRetrofitRequest(File file); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java deleted file mode 100644 index f417fff..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IUploadImagePresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import java.io.File; - -public interface IUploadImagePresenter { - void onReadyRetrofitRequest(File image); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 51f0e0b..30c1f97 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadAudioModelImpl; import com.casic.dcms.mvp.view.IUploadAudioView; import java.io.File; -public class UploadAudioPresenterImpl extends BasePresenter implements IUploadAudioPresenter, UploadAudioModelImpl.OnUploadAudioListener { +public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { private IUploadAudioView view; private UploadAudioModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File audio) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(audio)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadAudioResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadAudioResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java index b1edae8..18110a7 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadImagePresenterImpl.java @@ -1,13 +1,13 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.UploadImageModelImpl; import com.casic.dcms.mvp.view.IUploadImageView; import java.io.File; -public class UploadImagePresenterImpl extends BasePresenter implements IUploadImagePresenter, UploadImageModelImpl.OnUploadImageListener { +public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { private IUploadImageView view; private UploadImageModelImpl actionModel; @@ -18,15 +18,15 @@ } @Override - public void onReadyRetrofitRequest(File image) { + public void onReadyRetrofitRequest(File file) { view.showProgress(); - addSubscription(actionModel.sendRetrofitRequest(image)); + addSubscription(actionModel.sendRetrofitRequest(file)); } @Override - public void onSuccess(UploadImageResultBean resultBean) { + public void onSuccess(UploadResultBean resultBean) { view.hideProgress(); - view.obtainUploadResult(resultBean); + view.obtainUploadImageResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java new file mode 100644 index 0000000..61b82f9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -0,0 +1,41 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.UploadResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.UploadVideoModelImpl; +import com.casic.dcms.mvp.view.IUploadVideoView; + +import java.io.File; + +public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { + + private IUploadVideoView view; + private UploadVideoModelImpl actionModel; + + public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + this.view = uploadVideoView; + actionModel = new UploadVideoModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(File file) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(file)); + } + + @Override + public void onSuccess(UploadResultBean resultBean) { + view.hideProgress(); + view.obtainUploadVideoResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java index d1e2115..1d19de3 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadAudioResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadAudioView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadAudioResultBean resultBean); + void obtainUploadAudioResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java index ed80ab4..592e252 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java @@ -1,11 +1,11 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; public interface IUploadImageView { void showProgress(); void hideProgress(); - void obtainUploadResult(UploadImageResultBean resultBean); + void obtainUploadImageResult(UploadResultBean resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java new file mode 100644 index 0000000..af16799 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadVideoView { + void showProgress(); + + void hideProgress(); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index de2fa49..2dd6846 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -8,6 +8,7 @@ import android.media.MediaPlayer; import android.media.MediaRecorder; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.EditText; @@ -25,18 +26,19 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadAudioPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; +import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; import com.casic.dcms.mvp.view.ICaseSubmitCaseView; import com.casic.dcms.mvp.view.IUploadAudioView; import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadVideoView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -63,9 +65,11 @@ import butterknife.BindView; import butterknife.OnClick; +import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, + IUploadVideoView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -98,6 +102,8 @@ ImageView addImageView; @BindView(R.id.selectedResultView) RecyclerView selectedResultView; + @BindView(R.id.videoPlayerView) + JCVideoPlayerStandard videoPlayerView; @BindView(R.id.submitButton) QMUIRoundButton submitButton; @@ -118,6 +124,8 @@ private UploadAudioPresenterImpl uploadAudioPresenter; private ImageRecycleViewAdapter imageAdapter; private MediaPlayer mediaPlayer; + private String gridId; + private UploadVideoPresenterImpl uploadVideoPresenter; @Override public int initLayoutView() { @@ -151,6 +159,7 @@ .create(); uploadImagePresenter = new UploadImagePresenterImpl(this); uploadAudioPresenter = new UploadAudioPresenterImpl(this); + uploadVideoPresenter = new UploadVideoPresenterImpl(this); imageAdapter = new ImageRecycleViewAdapter(this); selectedResultView.setLayoutManager(new GridLayoutManager(this, 2)); selectedResultView.addItemDecoration(new ItemDecorationSpace()); @@ -282,15 +291,14 @@ takePicture(); } }) -// .addItem("相机拍视频", new DialogInterface.OnClickListener() { -// @Override -// public void onClick(DialogInterface dialog, int which) { -// dialog.dismiss(); -// //拍视频 -// takeVideo(); -// } -// }) - .setCanceledOnTouchOutside(false) + .addItem("相机拍视频", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + //拍视频 + takeVideo(); + } + }) .create().show(); break; case R.id.submitButton: @@ -328,8 +336,11 @@ .openCamera(PictureMimeType.ofVideo()) .imageEngine(GlideLoadEngine.createGlideEngine()) .maxSelectNum(1) + .isCompress(true) + .compressQuality(80) + .compressSavePath(FileUtils.getVideoCompressPath()) .videoMaxSecond(15) - .forResult(PictureConfig.REQUEST_CAMERA); + .forResult(PictureConfig.PREVIEW_VIDEO_CODE); } @Override @@ -348,12 +359,18 @@ 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" + uploadVideoPresenter.onReadyRetrofitRequest(new File(media.getRealPath())); + break; case Constant.REQUEST_MAP_CODE: 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"); longitudeView.setText(String.valueOf(longitude)); @@ -430,7 +447,8 @@ } //显示录音文件路径 if (outputFile.exists()) { - caseDetailEditView.setText(outputFile.getAbsolutePath()); + String audioPath = outputFile.getAbsolutePath(); + uploadAudioPresenter.onReadyRetrofitRequest(new File(audioPath)); } else { caseDetailEditView.setText("录音保存失败"); } @@ -476,7 +494,7 @@ @SuppressLint("SetTextI18n") @Override - public void obtainUploadResult(UploadAudioResultBean resultBean) { + public void obtainUploadAudioResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { String data = resultBean.getData().replace("\\", "/"); @@ -510,7 +528,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { /** @@ -547,6 +565,13 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + if (resultBean.isSuccess()) { + Log.d(TAG, "obtainUploadVideoResult: " + gson.toJson(resultBean)); + } + } + /** * 案卷提交 */ @@ -567,8 +592,11 @@ return; } caseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "1", "1", eorc, typeCode, typeDetailCode, "崇仁县", "巴山镇", - "361024", "361024100", description, fieldIntro, + "1", "1", eorc, typeCode, typeDetailCode, + gridId.substring(0, 6), + gridId.substring(0, 9), + communityNameView.getText().toString(), + gridId, description, fieldIntro, gson.toJson(mediaList), 0, 0); } 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 af88245..1d36e41 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.CaseLargeClassBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.CaseLargeClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSmallClassPresenterImpl; import com.casic.dcms.mvp.presenter.CaseSubmitPresenterImpl; @@ -235,7 +235,6 @@ takePicture(); } }) - .setCanceledOnTouchOutside(false) .create().show(); break; case R.id.locationMapView: @@ -360,7 +359,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); diff --git a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java index 6dfff75..5bb9d74 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.ImageRecycleViewAdapter; import com.casic.dcms.base.BaseActivity; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.IUploadImageView; import com.casic.dcms.utils.Constant; @@ -224,7 +224,7 @@ } @Override - public void obtainUploadResult(UploadImageResultBean resultBean) { + public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); /** diff --git a/app/src/main/java/com/casic/dcms/utils/FileUtils.java b/app/src/main/java/com/casic/dcms/utils/FileUtils.java index 6c7a6fa..994de29 100644 --- a/app/src/main/java/com/casic/dcms/utils/FileUtils.java +++ b/app/src/main/java/com/casic/dcms/utils/FileUtils.java @@ -33,4 +33,12 @@ } return dir.toString(); } + + public static String getVideoCompressPath() { + File dir = new File(Environment.getExternalStorageDirectory(), "VideoFile"); + if (!dir.exists()) { + dir.mkdir(); + } + return dir.toString(); + } } 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 14122ce..f505301 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 @@ -18,8 +18,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import okhttp3.MultipartBody; @@ -230,14 +229,22 @@ */ @Multipart @POST("/fileUpload") - Observable uploadImage(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadImage(@Header("token") String token, + @Part MultipartBody.Part file); /** * 上传案卷音频 */ @Multipart @POST("/fileUpload") - Observable uploadAudio(@Header("token") String token, - @Part MultipartBody.Part file); + Observable uploadAudio(@Header("token") String token, + @Part MultipartBody.Part file); + + /** + * 上传案卷视频 + */ + @Multipart + @POST("/fileUpload") + Observable uploadVideo(@Header("token") String token, + @Part MultipartBody.Part file); } 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 43a31a5..01ad905 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 @@ -20,8 +20,7 @@ import com.casic.dcms.bean.PhoneBookBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.SubmitResultBean; -import com.casic.dcms.bean.UploadAudioResultBean; -import com.casic.dcms.bean.UploadImageResultBean; +import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.bean.UserBean; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.HttpConfig; @@ -280,7 +279,7 @@ * 系统路径static拼接图片返回路径 * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ - public static Observable getImageUploadResult(File image) { + public static Observable getImageUploadResult(File image) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("image/png"), image); @@ -291,11 +290,22 @@ /** * 上传案卷音频 */ - public static Observable getAudioUploadResult(File audio) { + public static Observable getAudioUploadResult(File audio) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); RequestBody requestBody = RequestBody.create(MediaType.parse("audio/m4a"), audio); MultipartBody.Part imagePart = MultipartBody.Part.createFormData("file", audio.getName(), requestBody); return service.uploadAudio(TokenHelper.getToken(), imagePart); } + + /** + * 上传案卷视频 + */ + public static Observable getVideoUploadResult(File video) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + RequestBody requestBody = RequestBody.create(MediaType.parse("video/mp4"), video); + MultipartBody.Part imagePart = MultipartBody.Part.createFormData("file", video.getName(), requestBody); + return service.uploadVideo(TokenHelper.getToken(), imagePart); + } } diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5f49244..dde439c 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -249,22 +249,37 @@ android:layout_height="wrap_content" android:layout_marginStart="100dp" android:layout_marginEnd="10dp" - android:layout_toStartOf="@id/voiceView" android:background="@drawable/bg_layout" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:maxLength="50" - android:padding="3dp" /> + android:paddingHorizontal="3dp" + android:paddingVertical="5dp" /> + + + + + + + + android:paddingHorizontal="30dp" + android:paddingVertical="5dp" + android:text="1''" + android:visibility="visible" /> @@ -295,11 +311,16 @@ android:layout_marginEnd="10dp" android:orientation="vertical"> + +