From 4e0766ff7389dcb31de43b4a00cf88e16b1663fe Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Tue, 8 Oct 2024 14:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java | 11 ++++++++++-
 .../main/java/com/hjx/parent/HomeworkFeedbackActivity.java   |  2 ++
 app/src/main/java/com/hjx/parent/HomeworkSelectActivity.java | 12 +++++++++++-
 app/src/main/java/com/hjx/parent/StuHomeworkActivity.java    | 12 ++++++++----
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java b/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
index d3194a8..2b3f4bf 100644
--- a/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
+++ b/app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -49,13 +50,21 @@ public class HomeworkDetailActivity extends BaseRxActivity<ActivityHomeworkDetai
             intent.putExtra("data", mData);
             intent.putExtra("student", student);
             intent.putExtra("list", new ArrayList<>(mAdapter.getData()));
-            startActivity(intent);
+            startActivityForResult(intent, 0xA01);
         });
         binding.btnEdit.setOnClickListener(v -> mDialog.show(data -> {
             edit(data);
         }));
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 0xA01 && resultCode == RESULT_OK) {
+            finish();
+        }
+    }
+
     @SuppressLint("CheckResult")
     private void getDetail() {
         NetWorks.service_url.getHomeworkDetail(NetWorks.getHeader(), mData.getId())
diff --git a/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java b/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
index e3e8a49..3ec16fc 100644
--- a/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
+++ b/app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
@@ -99,6 +99,8 @@ public class HomeworkFeedbackActivity extends BaseRxActivity<ActivityHomeworkFee
                     if (response != null && response.getSuccess()) {
                         // TODO
                         Toast.makeText(this, "反馈成功", Toast.LENGTH_SHORT).show();
+                        setResult(RESULT_OK);
+                        finish();
                     }
                 });
     }
diff --git a/app/src/main/java/com/hjx/parent/HomeworkSelectActivity.java b/app/src/main/java/com/hjx/parent/HomeworkSelectActivity.java
index 2e3c23f..e3f9a04 100644
--- a/app/src/main/java/com/hjx/parent/HomeworkSelectActivity.java
+++ b/app/src/main/java/com/hjx/parent/HomeworkSelectActivity.java
@@ -10,6 +10,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.MutableLiveData;
 
 import com.bumptech.glide.Glide;
@@ -73,11 +74,20 @@ public class HomeworkSelectActivity extends BaseRxActivity<ActivityHomeworkSelec
             intent.putExtra("data", mData);
             intent.putExtra("list", mList);
             intent.putExtra("student", student);
-            startActivity(intent);
+            startActivityForResult(intent, 0xA01);
         });
     }
 
     @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 0xA01 && resultCode == RESULT_OK) {
+            setResult(RESULT_OK);
+            finish();
+        }
+    }
+
+    @Override
     protected ActivityHomeworkSelectBinding getViewBinding() {
         return ActivityHomeworkSelectBinding.inflate(getLayoutInflater());
     }
diff --git a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
index d0fd3a3..1a24495 100644
--- a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
+++ b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
@@ -76,10 +76,14 @@ public class StuHomeworkActivity extends BaseRxActivity<ActivityStudentHomeworkB
             }, null);
         };
         homeworkAdapter.detailCall = data -> {
-            Intent intent = new Intent(this, HomeworkDetailActivity.class);
-            intent.putExtra("data", data);
-            intent.putExtra("student", state.student);
-            startActivity(intent);
+            if (data.getRight() == null) {
+                Intent intent = new Intent(this, HomeworkDetailActivity.class);
+                intent.putExtra("data", data);
+                intent.putExtra("student", state.student);
+                startActivity(intent);
+            } else {
+                // TODO
+            }
         };
 
         binding.btnChangeStudent.setOnClickListener(v -> {
-- 
1.9.0