zhanghaochen / ParentControl

Download as
Browse Code »

Commit 4e0766ff7389dcb31de43b4a00cf88e16b1663fe

Authored by shixianjie
1 parent a0aac741c4
Exists in master

反馈完成后回到列表

Showing 4 changed files with 31 additions and 6 deletions   Show diff stats
app/src/main/java/com/hjx/parent/HomeworkDetailActivity.java
Diff comments   View file @4e0766f
... ... @@ -7,6 +7,7 @@ import android.widget.ImageView;
7 7 import android.widget.TextView;
8 8  
9 9 import androidx.annotation.NonNull;
  10 +import androidx.annotation.Nullable;
10 11  
11 12 import com.bumptech.glide.Glide;
12 13 import com.chad.library.adapter.base.BaseQuickAdapter;
... ... @@ -49,13 +50,21 @@ public class HomeworkDetailActivity extends BaseRxActivity<ActivityHomeworkDetai
49 50 intent.putExtra("data", mData);
50 51 intent.putExtra("student", student);
51 52 intent.putExtra("list", new ArrayList<>(mAdapter.getData()));
52   - startActivity(intent);
  53 + startActivityForResult(intent, 0xA01);
53 54 });
54 55 binding.btnEdit.setOnClickListener(v -> mDialog.show(data -> {
55 56 edit(data);
56 57 }));
57 58 }
58 59  
  60 + @Override
  61 + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
  62 + super.onActivityResult(requestCode, resultCode, data);
  63 + if (requestCode == 0xA01 && resultCode == RESULT_OK) {
  64 + finish();
  65 + }
  66 + }
  67 +
59 68 @SuppressLint("CheckResult")
60 69 private void getDetail() {
61 70 NetWorks.service_url.getHomeworkDetail(NetWorks.getHeader(), mData.getId())
... ...
app/src/main/java/com/hjx/parent/HomeworkFeedbackActivity.java
Diff comments   View file @4e0766f
... ... @@ -99,6 +99,8 @@ public class HomeworkFeedbackActivity extends BaseRxActivity&lt;ActivityHomeworkFee
99 99 if (response != null && response.getSuccess()) {
100 100 // TODO
101 101 Toast.makeText(this, "反馈成功", Toast.LENGTH_SHORT).show();
  102 + setResult(RESULT_OK);
  103 + finish();
102 104 }
103 105 });
104 106 }
... ...
app/src/main/java/com/hjx/parent/HomeworkSelectActivity.java
Diff comments   View file @4e0766f
... ... @@ -10,6 +10,7 @@ import android.widget.ImageView;
10 10 import android.widget.TextView;
11 11  
12 12 import androidx.annotation.NonNull;
  13 +import androidx.annotation.Nullable;
13 14 import androidx.lifecycle.MutableLiveData;
14 15  
15 16 import com.bumptech.glide.Glide;
... ... @@ -73,11 +74,20 @@ public class HomeworkSelectActivity extends BaseRxActivity&lt;ActivityHomeworkSelec
73 74 intent.putExtra("data", mData);
74 75 intent.putExtra("list", mList);
75 76 intent.putExtra("student", student);
76   - startActivity(intent);
  77 + startActivityForResult(intent, 0xA01);
77 78 });
78 79 }
79 80  
80 81 @Override
  82 + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
  83 + super.onActivityResult(requestCode, resultCode, data);
  84 + if (requestCode == 0xA01 && resultCode == RESULT_OK) {
  85 + setResult(RESULT_OK);
  86 + finish();
  87 + }
  88 + }
  89 +
  90 + @Override
81 91 protected ActivityHomeworkSelectBinding getViewBinding() {
82 92 return ActivityHomeworkSelectBinding.inflate(getLayoutInflater());
83 93 }
... ...
app/src/main/java/com/hjx/parent/StuHomeworkActivity.java
Diff comments   View file @4e0766f
... ... @@ -76,10 +76,14 @@ public class StuHomeworkActivity extends BaseRxActivity&lt;ActivityStudentHomeworkB
76 76 }, null);
77 77 };
78 78 homeworkAdapter.detailCall = data -> {
79   - Intent intent = new Intent(this, HomeworkDetailActivity.class);
80   - intent.putExtra("data", data);
81   - intent.putExtra("student", state.student);
82   - startActivity(intent);
  79 + if (data.getRight() == null) {
  80 + Intent intent = new Intent(this, HomeworkDetailActivity.class);
  81 + intent.putExtra("data", data);
  82 + intent.putExtra("student", state.student);
  83 + startActivity(intent);
  84 + } else {
  85 + // TODO
  86 + }
83 87 };
84 88  
85 89 binding.btnChangeStudent.setOnClickListener(v -> {
... ...