diff --git a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java index 9ad4906..f25cdb9 100644 --- a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java +++ b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java @@ -86,22 +86,21 @@ public class StuHomeworkActivity extends BaseRxActivity showSubjectFilter()); binding.ftGrade.setOnClickListener(v -> showGradeFilter()); binding.ftTerm.setOnClickListener(v -> showTermFilter()); binding.ftFeedback.setOnClickListener(v -> showFeedbackFilter()); homeworkAdapter.deleteCall = data -> { - if (deleteDialog == null) { - deleteDialog = new MsgConfirmDialog.Builder(this) - .setMessage("确认要删除吗?一旦删除不可恢复") - .setPositive("暂不删除") - .setNegative("确定删除") - .build(); - } - deleteDialog.show(() -> { + deleteDialog.show(null, () -> { deleteHomework(data); return true; - }, null); + }); }; homeworkAdapter.detailCall = data -> { if (data.getRight() == null) { @@ -133,6 +132,13 @@ public class StuHomeworkActivity extends BaseRxActivity goHuyou(data, 0); stageAdapter.detailCall = data -> goHuyou(data, 1); + weekAdapter.deleteCall = data -> { + deleteDialog.show(null, () -> { + deleteHuyou(data); + return true; + }); + }; + stageAdapter.deleteCall = weekAdapter.deleteCall; getWeekHuyou(); getStageHuyou(); @@ -349,6 +355,28 @@ public class StuHomeworkActivity extends BaseRxActivity { + cancelLoadingDialog(); + if (throwable != null) { + loadFail("失败"); + throwable.printStackTrace(); + return; + } + if (detail.type == 0) { + getWeekHuyou(); + } else { + getStageHuyou(); + } + }); + } + private void showSubjectFilter() { if (subjectFilter == null) { PopupFilterSubjectBinding db = PopupFilterSubjectBinding.inflate(getLayoutInflater());