diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java index 0d29061..f9ec657 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java @@ -23,6 +23,12 @@ } @Override + public void onReadyRetrofitRequest(String jobStatus, String handleMessage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(jobStatus, handleMessage)); + } + + @Override public void disposeRetrofitRequest() { unSubscription(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java index 0d29061..f9ec657 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java @@ -23,6 +23,12 @@ } @Override + public void onReadyRetrofitRequest(String jobStatus, String handleMessage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(jobStatus, handleMessage)); + } + + @Override public void disposeRetrofitRequest() { unSubscription(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java index b0ae2de..f5274cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java @@ -3,5 +3,7 @@ public interface ICancelAlarmPresenter { void onReadyRetrofitRequest(String id, String jobStatus, String handleMessage); + void onReadyRetrofitRequest(String jobStatus, String handleMessage); + void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java index 0d29061..f9ec657 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java @@ -23,6 +23,12 @@ } @Override + public void onReadyRetrofitRequest(String jobStatus, String handleMessage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(jobStatus, handleMessage)); + } + + @Override public void disposeRetrofitRequest() { unSubscription(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java index b0ae2de..f5274cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java @@ -3,5 +3,7 @@ public interface ICancelAlarmPresenter { void onReadyRetrofitRequest(String id, String jobStatus, String handleMessage); + void onReadyRetrofitRequest(String jobStatus, String handleMessage); + void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java index 7bd754c..b1b7352 100644 --- a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java @@ -102,7 +102,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: -// showCancelDialog(null); + showBatchCancelDialog(); break; case 1: @@ -178,7 +178,7 @@ resultActivity.adapter.setOnCancelClickListener(new AlarmListAdapter.OnCancelClickListener() { @Override public void onClick(int position) { - resultActivity.showCancelDialog(resultActivity.dataBeans.get(position).getJobId()); + resultActivity.showSingleCancelDialog(resultActivity.dataBeans.get(position).getJobId()); } }); } @@ -187,7 +187,8 @@ } } - private void showCancelDialog(String jobId) { + //单个消警 + private void showSingleCancelDialog(String jobId) { //已处理status = 3，无需处理status = 4 new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override @@ -202,6 +203,22 @@ }).build().show(); } + //一键消警 + private void showBatchCancelDialog() { + //已处理status = 3，无需处理status = 4 + new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick(String status, String editReason) { + cancelAlarmPresenter.onReadyRetrofitRequest(status, editReason); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java index 0d29061..f9ec657 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java @@ -23,6 +23,12 @@ } @Override + public void onReadyRetrofitRequest(String jobStatus, String handleMessage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(jobStatus, handleMessage)); + } + + @Override public void disposeRetrofitRequest() { unSubscription(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java index b0ae2de..f5274cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java @@ -3,5 +3,7 @@ public interface ICancelAlarmPresenter { void onReadyRetrofitRequest(String id, String jobStatus, String handleMessage); + void onReadyRetrofitRequest(String jobStatus, String handleMessage); + void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java index 7bd754c..b1b7352 100644 --- a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java @@ -102,7 +102,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: -// showCancelDialog(null); + showBatchCancelDialog(); break; case 1: @@ -178,7 +178,7 @@ resultActivity.adapter.setOnCancelClickListener(new AlarmListAdapter.OnCancelClickListener() { @Override public void onClick(int position) { - resultActivity.showCancelDialog(resultActivity.dataBeans.get(position).getJobId()); + resultActivity.showSingleCancelDialog(resultActivity.dataBeans.get(position).getJobId()); } }); } @@ -187,7 +187,8 @@ } } - private void showCancelDialog(String jobId) { + //单个消警 + private void showSingleCancelDialog(String jobId) { //已处理status = 3，无需处理status = 4 new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override @@ -202,6 +203,22 @@ }).build().show(); } + //一键消警 + private void showBatchCancelDialog() { + //已处理status = 3，无需处理status = 4 + new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick(String status, String editReason) { + cancelAlarmPresenter.onReadyRetrofitRequest(status, editReason); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5e58cae..c60c7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -103,10 +103,10 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: - optionWellPresenter.onReadyRetrofitRequest("1"); + showBatchOptionDialog("布防", "1"); break; case 1: - optionWellPresenter.onReadyRetrofitRequest("0"); + showBatchOptionDialog("撤防", "0"); break; } } @@ -209,7 +209,7 @@ ToastHelper.showToast("窨井状态错误，无法进行撤防或者布防", ToastHelper.ERROR); return; } - activity.showOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); + activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); } }); @@ -219,7 +219,8 @@ } } - private void showOptionDialog(String bfztName, String id, String bfzt) { + //单个撤防/布防 + private void showSingleOptionDialog(String bfztName, String id, String bfzt) { new QMUIDialog.MessageDialogBuilder(this) .setTitle("确认操作") .setMessage("确定要对该井进行" + bfztName + "吗？") @@ -235,6 +236,23 @@ .create().show(); } + //一键撤防/布防 + private void showBatchOptionDialog(String bfztName, String bfzt) { + new QMUIDialog.MessageDialogBuilder(this) + .setTitle("确认操作") + .setMessage("确定要对列表中的全部井进行" + bfztName + "吗？") + .setCanceledOnTouchOutside(true) + .addAction("取消", (dialog, index) -> dialog.dismiss()) + .addAction("确定", new QMUIDialogAction.ActionListener() { + @Override + public void onClick(QMUIDialog dialog, int index) { + dialog.dismiss(); + optionWellPresenter.onReadyRetrofitRequest(bfzt); + } + }) + .create().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java index 0d29061..f9ec657 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java @@ -23,6 +23,12 @@ } @Override + public void onReadyRetrofitRequest(String jobStatus, String handleMessage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(jobStatus, handleMessage)); + } + + @Override public void disposeRetrofitRequest() { unSubscription(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java index b0ae2de..f5274cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java @@ -3,5 +3,7 @@ public interface ICancelAlarmPresenter { void onReadyRetrofitRequest(String id, String jobStatus, String handleMessage); + void onReadyRetrofitRequest(String jobStatus, String handleMessage); + void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java index 7bd754c..b1b7352 100644 --- a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java @@ -102,7 +102,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: -// showCancelDialog(null); + showBatchCancelDialog(); break; case 1: @@ -178,7 +178,7 @@ resultActivity.adapter.setOnCancelClickListener(new AlarmListAdapter.OnCancelClickListener() { @Override public void onClick(int position) { - resultActivity.showCancelDialog(resultActivity.dataBeans.get(position).getJobId()); + resultActivity.showSingleCancelDialog(resultActivity.dataBeans.get(position).getJobId()); } }); } @@ -187,7 +187,8 @@ } } - private void showCancelDialog(String jobId) { + //单个消警 + private void showSingleCancelDialog(String jobId) { //已处理status = 3，无需处理status = 4 new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override @@ -202,6 +203,22 @@ }).build().show(); } + //一键消警 + private void showBatchCancelDialog() { + //已处理status = 3，无需处理status = 4 + new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick(String status, String editReason) { + cancelAlarmPresenter.onReadyRetrofitRequest(status, editReason); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5e58cae..c60c7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -103,10 +103,10 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: - optionWellPresenter.onReadyRetrofitRequest("1"); + showBatchOptionDialog("布防", "1"); break; case 1: - optionWellPresenter.onReadyRetrofitRequest("0"); + showBatchOptionDialog("撤防", "0"); break; } } @@ -209,7 +209,7 @@ ToastHelper.showToast("窨井状态错误，无法进行撤防或者布防", ToastHelper.ERROR); return; } - activity.showOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); + activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); } }); @@ -219,7 +219,8 @@ } } - private void showOptionDialog(String bfztName, String id, String bfzt) { + //单个撤防/布防 + private void showSingleOptionDialog(String bfztName, String id, String bfzt) { new QMUIDialog.MessageDialogBuilder(this) .setTitle("确认操作") .setMessage("确定要对该井进行" + bfztName + "吗？") @@ -235,6 +236,23 @@ .create().show(); } + //一键撤防/布防 + private void showBatchOptionDialog(String bfztName, String bfzt) { + new QMUIDialog.MessageDialogBuilder(this) + .setTitle("确认操作") + .setMessage("确定要对列表中的全部井进行" + bfztName + "吗？") + .setCanceledOnTouchOutside(true) + .addAction("取消", (dialog, index) -> dialog.dismiss()) + .addAction("确定", new QMUIDialogAction.ActionListener() { + @Override + public void onClick(QMUIDialog dialog, int index) { + dialog.dismiss(); + optionWellPresenter.onReadyRetrofitRequest(bfzt); + } + }) + .create().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); 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 fdabe5d..16a9d4c 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 @@ -714,7 +714,7 @@ @Query("offset") int offset); /** - * 取消报警 + * 单个取消报警 *

* http://111.198.10.15:11409/smartwell/alarm/cancelAlarm?id=1232266&jobStatus=3&handleMessage=dfgdfgd */ @@ -726,6 +726,17 @@ @Field("handleMessage") String handleMessage); /** + * 一键取消报警 + *

+ * http://111.198.10.15:11409/smartwell/alarm/batchCancel?jobStatus=3&handleMessage=ffsdf + */ + @FormUrlEncoded + @POST("/smartwell/alarm/batchCancel") + Observable cancelAlarm(@Header("token") String token, + @Field("jobStatus") String jobStatus, + @Field("handleMessage") String handleMessage); + + /** * 窨井列表 *

* http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java index dc31347..2bef760 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CancelAlarmModelImpl.java @@ -48,4 +48,29 @@ } }); } + + @Override + public Subscription sendRetrofitRequest(String jobStatus, String handleMessage) { + Observable observable = RetrofitServiceManager.getCancelAlarmResult(jobStatus, handleMessage); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java index ebf5c2d..2f7a9a1 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICancelAlarmModel.java @@ -4,4 +4,6 @@ public interface ICancelAlarmModel { Subscription sendRetrofitRequest(String id, String jobStatus, String handleMessage); + + Subscription sendRetrofitRequest(String jobStatus, String handleMessage); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java index 0d29061..f9ec657 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CancelAlarmPresenterImpl.java @@ -23,6 +23,12 @@ } @Override + public void onReadyRetrofitRequest(String jobStatus, String handleMessage) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(jobStatus, handleMessage)); + } + + @Override public void disposeRetrofitRequest() { unSubscription(); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java index b0ae2de..f5274cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICancelAlarmPresenter.java @@ -3,5 +3,7 @@ public interface ICancelAlarmPresenter { void onReadyRetrofitRequest(String id, String jobStatus, String handleMessage); + void onReadyRetrofitRequest(String jobStatus, String handleMessage); + void disposeRetrofitRequest(); } diff --git a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java index 7bd754c..b1b7352 100644 --- a/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PipelineManagerActivity.java @@ -102,7 +102,7 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: -// showCancelDialog(null); + showBatchCancelDialog(); break; case 1: @@ -178,7 +178,7 @@ resultActivity.adapter.setOnCancelClickListener(new AlarmListAdapter.OnCancelClickListener() { @Override public void onClick(int position) { - resultActivity.showCancelDialog(resultActivity.dataBeans.get(position).getJobId()); + resultActivity.showSingleCancelDialog(resultActivity.dataBeans.get(position).getJobId()); } }); } @@ -187,7 +187,8 @@ } } - private void showCancelDialog(String jobId) { + //单个消警 + private void showSingleCancelDialog(String jobId) { //已处理status = 3，无需处理status = 4 new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { @Override @@ -202,6 +203,22 @@ }).build().show(); } + //一键消警 + private void showBatchCancelDialog() { + //已处理status = 3，无需处理status = 4 + new CancelAlarmDialog.Builder().setContext(this).setOnDialogButtonClickListener(new CancelAlarmDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick(String status, String editReason) { + cancelAlarmPresenter.onReadyRetrofitRequest(status, editReason); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5e58cae..c60c7cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -103,10 +103,10 @@ public void onItemClick(AdapterView parent, View view, int position, long id) { switch (position) { case 0: - optionWellPresenter.onReadyRetrofitRequest("1"); + showBatchOptionDialog("布防", "1"); break; case 1: - optionWellPresenter.onReadyRetrofitRequest("0"); + showBatchOptionDialog("撤防", "0"); break; } } @@ -209,7 +209,7 @@ ToastHelper.showToast("窨井状态错误，无法进行撤防或者布防", ToastHelper.ERROR); return; } - activity.showOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); + activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); } }); @@ -219,7 +219,8 @@ } } - private void showOptionDialog(String bfztName, String id, String bfzt) { + //单个撤防/布防 + private void showSingleOptionDialog(String bfztName, String id, String bfzt) { new QMUIDialog.MessageDialogBuilder(this) .setTitle("确认操作") .setMessage("确定要对该井进行" + bfztName + "吗？") @@ -235,6 +236,23 @@ .create().show(); } + //一键撤防/布防 + private void showBatchOptionDialog(String bfztName, String bfzt) { + new QMUIDialog.MessageDialogBuilder(this) + .setTitle("确认操作") + .setMessage("确定要对列表中的全部井进行" + bfztName + "吗？") + .setCanceledOnTouchOutside(true) + .addAction("取消", (dialog, index) -> dialog.dismiss()) + .addAction("确定", new QMUIDialogAction.ActionListener() { + @Override + public void onClick(QMUIDialog dialog, int index) { + dialog.dismiss(); + optionWellPresenter.onReadyRetrofitRequest(bfzt); + } + }) + .create().show(); + } + @Override public void showProgress() { OtherUtils.showLoadingDialog(this, "处理中，请稍后..."); 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 fdabe5d..16a9d4c 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 @@ -714,7 +714,7 @@ @Query("offset") int offset); /** - * 取消报警 + * 单个取消报警 *

* http://111.198.10.15:11409/smartwell/alarm/cancelAlarm?id=1232266&jobStatus=3&handleMessage=dfgdfgd */ @@ -726,6 +726,17 @@ @Field("handleMessage") String handleMessage); /** + * 一键取消报警 + *

+ * http://111.198.10.15:11409/smartwell/alarm/batchCancel?jobStatus=3&handleMessage=ffsdf + */ + @FormUrlEncoded + @POST("/smartwell/alarm/batchCancel") + Observable cancelAlarm(@Header("token") String token, + @Field("jobStatus") String jobStatus, + @Field("handleMessage") String handleMessage); + + /** * 窨井列表 *

* http://111.198.10.15:11409/smartwell/well/list?offset=1&limit=15&sort=wellCode&order=asc 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 ac2ee88..7c3705f 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 @@ -731,7 +731,7 @@ } /** - * 取消报警 + * 单个取消报警 */ public static Observable getCancelAlarmResult(String id, String jobStatus, String handleMessage) { Retrofit retrofit = createRetrofit(); @@ -740,6 +740,15 @@ } /** + * 一键取消报警 + */ + public static Observable getCancelAlarmResult(String jobStatus, String handleMessage) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.cancelAlarm(AuthenticationHelper.getToken(), jobStatus, handleMessage); + } + + /** * 窨井列表 */ public static Observable getWellListResult(int offset) {