From bd79e76cddec67897be48aba154bb57ba032e5ed Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Tue, 8 Oct 2024 16:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hjx/parent/HomeworkFeedbackActivity.java    |  9 ++++++++-
 .../main/java/com/hjx/parent/fragment/ErrorFragment.java | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java b/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
index 3ec16fc..6ee8474 100644
--- a/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
+++ b/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
@@ -97,8 +97,15 @@ public class HomeworkFeedbackActivity extends BaseRxActivity<ActivityHomeworkFee
                 .subscribe((response, th) -> {
                     if (th != null) th.printStackTrace();
                     if (response != null && response.getSuccess()) {
-                        // TODO
                         Toast.makeText(this, "反馈成功", Toast.LENGTH_SHORT).show();
+
+                        Intent intent = new Intent(this, HomeworkShareActivity.class);
+                        intent.putExtra("student", student);
+                        intent.putExtra("id", mData.getId());
+                        intent.putExtra("grade", mData.getGrade());
+                        intent.putExtra("subject", mData.getSubject());
+                        startActivity(intent);
+
                         setResult(RESULT_OK);
                         finish();
                     }
diff --git a/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java b/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
index 4c6dba1..8ea5709 100644
--- a/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
+++ b/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
@@ -32,6 +32,7 @@ import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
 import com.hjx.parent.ErrorListActivity;
+import com.hjx.parent.HomeworkDetailActivity;
 import com.hjx.parent.ImageActivity;
 import com.hjx.parent.R;
 import com.hjx.parent.StuHomeworkActivity;
@@ -43,6 +44,7 @@ import com.hjx.parent.databinding.FragmentErrorBookBinding;
 import com.hjx.parent.rx.BaseRxFragment;
 import com.prws.common.bean.PageInfo;
 import com.prws.common.bean.ResponseResult;
+import com.prws.common.bean.Student;
 import com.prws.common.bean.TopicBean;
 import com.prws.common.net.NetWorks;
 import com.prws.common.utils.BitmapUtils;
@@ -163,6 +165,15 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
 
         errorAdapter = new ErrorAdapter(getActivity(), new ArrayList<>(), false);
         homeworkAdapter = new HomeworkAdapter();
+        homeworkAdapter.setOnItemClickListener((baseQuickAdapter, view1, i) -> {
+            Gson gson = new Gson();
+            String json = gson.toJson(studentBean);
+            Student s = gson.fromJson(json, Student.class);
+            Intent intent = new Intent(requireContext(), HomeworkDetailActivity.class);
+            intent.putExtra("student", s);
+            intent.putExtra("data", homeworkAdapter.getData().get(i));
+            startActivity(intent);
+        });
         binding.rvMain.setAdapter(errorAdapter);
         binding.tabLayout.addTab(binding.tabLayout.newTab().setText("最近错题"));
         binding.tabLayout.addTab(binding.tabLayout.newTab().setText("最近作业"));
@@ -275,6 +286,7 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
                 .toObservable()
                 .flatMap(Observable::fromIterable)
                 .filter(data -> subject.equals(data.getSubject()))
+                .filter(data -> data.getRight() == null)
                 .toList()
                 .subscribe((data, th) -> {
                     if (th != null) th.printStackTrace();
@@ -282,6 +294,10 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
                         Collections.sort(data);
                     }
                     homeworkAdapter.setNewData(data);
+                    if (binding.tabLayout.getSelectedTabPosition() == 1) {
+                        binding.rvMain.setVisibility(data == null || data.isEmpty() ? View.GONE : View.VISIBLE);
+                        binding.llEmpty.setVisibility(data == null || data.isEmpty() ? View.VISIBLE : View.GONE);
+                    }
                 });
     }
 
-- 
1.9.0