From 3119571af64165607fadec75eed47b5a85eafc85 Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Wed, 9 Oct 2024 15:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E7=BB=9F=E8=AE=A1=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hjx/parent/StuHomeworkActivity.java   | 46 +++++++++++++++++-----
 1 file changed, 37 insertions(+), 9 deletions(-)

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<ActivityStudentHomeworkB
         setupTab();
         binding.recyclerView.setAdapter(homeworkAdapter);
 
+        deleteDialog = new MsgConfirmDialog.Builder(this)
+                .setMessage("确认要删除吗？一旦删除不可恢复")
+                .setPositive("暂不删除")
+                .setNegative("确定删除")
+                .build();
+
         binding.ftSubject.setOnClickListener(v -> 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<ActivityStudentHomeworkB
 
         weekAdapter.detailCall = data -> 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<ActivityStudentHomeworkB
                 });
     }
 
+    @SuppressLint("CheckResult")
+    private void deleteHuyou(StDetail detail) {
+        showLoadingDialog("稍等...");
+        NetWorks.service_url.deleteHuyou(NetWorks.getHeader(), detail.id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .compose(RxLifecycleAndroid.bindActivity(getRxLifecycle()))
+                .subscribe((response, throwable) -> {
+                    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());
-- 
1.9.0