From 937d37ac8b08ce38db5603ee0c11e407fdb9df98 Mon Sep 17 00:00:00 2001 From: shixianjie Date: Mon, 30 Sep 2024 16:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AD=A6=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hjx/parent/StuHomeworkActivity.java | 22 +++++++++++++++++++++ .../java/com/hjx/parent/TeacherChooseActivity.java | 1 + .../main/res/drawable/png_ic_change_student.png | Bin 0 -> 2947 bytes .../main/res/layout/activity_student_homework.xml | 7 +++++++ 4 files changed, 30 insertions(+) create mode 100644 app/src/main/res/drawable/png_ic_change_student.png diff --git a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java index a79d7a4..90accdf 100644 --- a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java +++ b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.widget.LinearLayout; import android.widget.PopupWindow; +import androidx.annotation.Nullable; import androidx.lifecycle.MutableLiveData; import com.google.gson.Gson; @@ -81,6 +82,27 @@ public class StuHomeworkActivity extends BaseRxActivity { + Intent intent = new Intent(this, TeacherChooseActivity.class); + intent.putExtra("needBack", true); + startActivityForResult(intent, 0xA01); + }); + } + + @SuppressLint("SetTextI18n") + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == 0xA01 && resultCode == RESULT_OK) { + String json = (String) SharedPreferencesUtil.getData("student", ""); + try { + state.student = new Gson().fromJson(json, Student.class); + binding.tvTitle.setText(state.student.stuName + "的全部作业"); + getHomework(); + } + catch (Throwable t) { t.printStackTrace(); } + } } @SuppressLint("CheckResult") diff --git a/app/src/main/java/com/hjx/parent/TeacherChooseActivity.java b/app/src/main/java/com/hjx/parent/TeacherChooseActivity.java index efea635..cec8c93 100644 --- a/app/src/main/java/com/hjx/parent/TeacherChooseActivity.java +++ b/app/src/main/java/com/hjx/parent/TeacherChooseActivity.java @@ -185,6 +185,7 @@ public class TeacherChooseActivity extends BaseActivity { SharedPreferencesUtil.putData("student", new Gson().toJson(studentBean)); startActivity(intent); } + setResult(RESULT_OK); finish(); } } diff --git a/app/src/main/res/drawable/png_ic_change_student.png b/app/src/main/res/drawable/png_ic_change_student.png new file mode 100644 index 0000000000000000000000000000000000000000..663c2b3192d420ddb49468ca147aa3c8c12b1c50 GIT binary patch literal 2947 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_student_homework.xml b/app/src/main/res/layout/activity_student_homework.xml index 8e20607..838665f 100644 --- a/app/src/main/res/layout/activity_student_homework.xml +++ b/app/src/main/res/layout/activity_student_homework.xml @@ -24,6 +24,13 @@ android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content"/> +