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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java new file mode 100644 index 0000000..16ba193 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -0,0 +1,15 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadFileView { + void showProgress(); + + void hideProgress(); + + void obtainUploadAudioResult(UploadResultBean resultBean); + + void obtainUploadImageResult(UploadResultBean resultBean); + + void obtainUploadVideoResult(UploadResultBean resultBean); +} 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java new file mode 100644 index 0000000..16ba193 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -0,0 +1,15 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadFileView { + void showProgress(); + + void hideProgress(); + + void obtainUploadAudioResult(UploadResultBean resultBean); + + void obtainUploadImageResult(UploadResultBean resultBean); + + void obtainUploadVideoResult(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 deleted file mode 100644 index 592e252..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadImageView { - void showProgress(); - - void hideProgress(); - - void obtainUploadImageResult(UploadResultBean resultBean); -} 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java new file mode 100644 index 0000000..16ba193 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -0,0 +1,15 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadFileView { + void showProgress(); + + void hideProgress(); + + void obtainUploadAudioResult(UploadResultBean resultBean); + + void obtainUploadImageResult(UploadResultBean resultBean); + + void obtainUploadVideoResult(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 deleted file mode 100644 index 592e252..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadImageView { - void showProgress(); - - void hideProgress(); - - 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 deleted file mode 100644 index af16799..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java +++ /dev/null @@ -1,11 +0,0 @@ -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/mvp/presenter/UploadAudioPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadAudioPresenterImpl.java index 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java new file mode 100644 index 0000000..16ba193 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -0,0 +1,15 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadFileView { + void showProgress(); + + void hideProgress(); + + void obtainUploadAudioResult(UploadResultBean resultBean); + + void obtainUploadImageResult(UploadResultBean resultBean); + + void obtainUploadVideoResult(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 deleted file mode 100644 index 592e252..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadImageView { - void showProgress(); - - void hideProgress(); - - 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 deleted file mode 100644 index af16799..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java +++ /dev/null @@ -1,11 +0,0 @@ -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 2dd6846..59da384 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -36,9 +36,7 @@ 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.mvp.view.IUploadFileView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -68,8 +66,7 @@ import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, - IUploadVideoView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -88,8 +85,6 @@ EditText latitudeView; @BindView(R.id.communityNameView) EditText communityNameView; - @BindView(R.id.locationMapView) - ImageView locationMapView; @BindView(R.id.caseLocationView) EditText caseLocationView; @BindView(R.id.caseDetailEditView) 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java new file mode 100644 index 0000000..16ba193 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -0,0 +1,15 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadFileView { + void showProgress(); + + void hideProgress(); + + void obtainUploadAudioResult(UploadResultBean resultBean); + + void obtainUploadImageResult(UploadResultBean resultBean); + + void obtainUploadVideoResult(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 deleted file mode 100644 index 592e252..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadImageView { - void showProgress(); - - void hideProgress(); - - 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 deleted file mode 100644 index af16799..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java +++ /dev/null @@ -1,11 +0,0 @@ -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 2dd6846..59da384 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -36,9 +36,7 @@ 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.mvp.view.IUploadFileView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -68,8 +66,7 @@ import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, - IUploadVideoView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -88,8 +85,6 @@ EditText latitudeView; @BindView(R.id.communityNameView) EditText communityNameView; - @BindView(R.id.locationMapView) - ImageView locationMapView; @BindView(R.id.caseLocationView) EditText caseLocationView; @BindView(R.id.caseDetailEditView) 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 1d36e41..59731cd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -28,7 +28,7 @@ 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.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -57,7 +57,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { private static final String TAG = "QuicklyActivity"; private Context context = this; @@ -359,6 +359,11 @@ } @Override + public void obtainUploadAudioResult(UploadResultBean resultBean) { + + } + + @Override public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { @@ -397,6 +402,11 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + + } + /** * 案卷提交 */ 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 30c1f97..949ef29 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadAudioPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadAudioModelImpl.OnUploadAudioListener { - private IUploadAudioView view; + private IUploadFileView view; private UploadAudioModelImpl actionModel; - public UploadAudioPresenterImpl(IUploadAudioView uploadAudioView) { + public UploadAudioPresenterImpl(IUploadFileView uploadAudioView) { this.view = uploadAudioView; actionModel = new UploadAudioModelImpl(this); } 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 18110a7..d13c5de 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 @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadImagePresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadImageModelImpl.OnUploadImageListener { - private IUploadImageView view; + private IUploadFileView view; private UploadImageModelImpl actionModel; - public UploadImagePresenterImpl(IUploadImageView uploadImageView) { + public UploadImagePresenterImpl(IUploadFileView uploadImageView) { this.view = uploadImageView; actionModel = new UploadImageModelImpl(this); } 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 index 61b82f9..a5bcf65 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/UploadVideoPresenterImpl.java @@ -3,16 +3,16 @@ 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 com.casic.dcms.mvp.view.IUploadFileView; import java.io.File; public class UploadVideoPresenterImpl extends BasePresenter implements IUploadFilePresenter, UploadVideoModelImpl.OnUploadVideoListener { - private IUploadVideoView view; + private IUploadFileView view; private UploadVideoModelImpl actionModel; - public UploadVideoPresenterImpl(IUploadVideoView uploadVideoView) { + public UploadVideoPresenterImpl(IUploadFileView uploadVideoView) { this.view = uploadVideoView; actionModel = new UploadVideoModelImpl(this); } 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 deleted file mode 100644 index 1d19de3..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadAudioView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadAudioView { - void showProgress(); - - void hideProgress(); - - void obtainUploadAudioResult(UploadResultBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java new file mode 100644 index 0000000..16ba193 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IUploadFileView.java @@ -0,0 +1,15 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.UploadResultBean; + +public interface IUploadFileView { + void showProgress(); + + void hideProgress(); + + void obtainUploadAudioResult(UploadResultBean resultBean); + + void obtainUploadImageResult(UploadResultBean resultBean); + + void obtainUploadVideoResult(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 deleted file mode 100644 index 592e252..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadImageView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.UploadResultBean; - -public interface IUploadImageView { - void showProgress(); - - void hideProgress(); - - 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 deleted file mode 100644 index af16799..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IUploadVideoView.java +++ /dev/null @@ -1,11 +0,0 @@ -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 2dd6846..59da384 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -36,9 +36,7 @@ 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.mvp.view.IUploadFileView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -68,8 +66,7 @@ import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard; public class CaseUploadActivity extends BaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadAudioView, IUploadImageView, - IUploadVideoView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { private static final String TAG = "CaseUploadActivity"; private Context context = this; @@ -88,8 +85,6 @@ EditText latitudeView; @BindView(R.id.communityNameView) EditText communityNameView; - @BindView(R.id.locationMapView) - ImageView locationMapView; @BindView(R.id.caseLocationView) EditText caseLocationView; @BindView(R.id.caseDetailEditView) 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 1d36e41..59731cd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -28,7 +28,7 @@ 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.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.ColorHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -57,7 +57,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadImageView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { private static final String TAG = "QuicklyActivity"; private Context context = this; @@ -359,6 +359,11 @@ } @Override + public void obtainUploadAudioResult(UploadResultBean resultBean) { + + } + + @Override public void obtainUploadImageResult(UploadResultBean resultBean) { // Log.d(TAG, "obtainUploadResult: " + gson.toJson(resultBean)); if (resultBean.isSuccess()) { @@ -397,6 +402,11 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + + } + /** * 案卷提交 */ 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 5bb9d74..9026180 100644 --- a/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/FivePackageUploadActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.UploadResultBean; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IUploadImageView; +import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; import com.casic.dcms.utils.GlideLoadEngine; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class FivePackageUploadActivity extends BaseActivity implements View.OnClickListener - , IUploadImageView { + , IUploadFileView { private static final String TAG = "PackageUploadActivity"; @BindView(R.id.leftBackView) @@ -224,6 +224,11 @@ } @Override + public void obtainUploadAudioResult(UploadResultBean resultBean) { + + } + + @Override public void obtainUploadImageResult(UploadResultBean resultBean) { if (resultBean.isSuccess()) { PictureFileUtils.deleteAllCacheDirFile(this); @@ -261,6 +266,11 @@ } } + @Override + public void obtainUploadVideoResult(UploadResultBean resultBean) { + + } + private void showBigImage(String path) { Intent intent = new Intent(this, BigPictureActivity.class); intent.putExtra("path", path);