From 19e49b3575d0c3e05d70ba23bbcf01a300be995a Mon Sep 17 00:00:00 2001 From: shixianjie Date: Thu, 26 Sep 2024 17:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=85=A5=E4=BD=9C=E4=B8=9A=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hjx/parent/AddSuccessActivity.java | 19 ++++++++++++++++++- app/src/main/java/com/hjx/parent/ImageActivity.java | 8 ++++++-- .../java/com/hjx/parent/dialog/AddHomeworkDialog.java | 11 +++++------ app/src/main/res/layout/activity_add_success.xml | 1 + .../main/java/com/prws/common/net/RetrofitUtils.java | 3 ++- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/hjx/parent/AddSuccessActivity.java b/app/src/main/java/com/hjx/parent/AddSuccessActivity.java index 5b6067b..d71be9a 100644 --- a/app/src/main/java/com/hjx/parent/AddSuccessActivity.java +++ b/app/src/main/java/com/hjx/parent/AddSuccessActivity.java @@ -33,8 +33,19 @@ public class AddSuccessActivity extends BaseActivity private int REQUEST_CODE_IMAGE = 123; private String filePath; + private int type; + private String stuId; + @Override public void initView(Bundle savedInstanceState) { + type = getIntent().getIntExtra("type", 0); + stuId = getIntent().getStringExtra("stuId"); + if (type == 1) { + binding.tvMsg.setText("作业录入成功！"); + binding.tvAdd.setText("继续录入作业"); + binding.tvBook.setText("查看作业详情"); + } + binding.ivBack.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -94,7 +105,11 @@ public class AddSuccessActivity extends BaseActivity binding.tvBook.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(context, ErrorListActivity.class)); + if (type == 0) { + startActivity(new Intent(context, ErrorListActivity.class)); + } else { + // TODO + } } }); } @@ -113,6 +128,7 @@ public class AddSuccessActivity extends BaseActivity CommonUtil.saveBitmapToUri(b, path); List strings = new ArrayList<>(); Intent intent = new Intent(context, ImageActivity.class); + intent.putExtra("type", type); strings.add(path); intent.putStringArrayListExtra("images", (ArrayList) strings); startActivity(intent); @@ -145,6 +161,7 @@ public class AddSuccessActivity extends BaseActivity if (selectImage.size() == photoList.size()) { List strings = new ArrayList<>(); Intent intent = new Intent(context, ImageActivity.class); + intent.putExtra("type", type); for (ImageInfo imageInfo : selectImage) { strings.add(imageInfo.getPath()); } diff --git a/app/src/main/java/com/hjx/parent/ImageActivity.java b/app/src/main/java/com/hjx/parent/ImageActivity.java index 6f7c577..eb3c8ab 100644 --- a/app/src/main/java/com/hjx/parent/ImageActivity.java +++ b/app/src/main/java/com/hjx/parent/ImageActivity.java @@ -354,8 +354,12 @@ public class ImageActivity extends BaseRxActivity implemen if (addHomeworkDialog == null) { addHomeworkDialog = new AddHomeworkDialog(this); } - addHomeworkDialog.show(paths, () -> { - // TODO + addHomeworkDialog.show(paths, student -> { + Intent intent = new Intent(context, AddSuccessActivity.class); + intent.putExtra("type", type); + intent.putExtra("stuId", student.stuId); + startActivity(intent); + finish(); }); } } diff --git a/app/src/main/java/com/hjx/parent/dialog/AddHomeworkDialog.java b/app/src/main/java/com/hjx/parent/dialog/AddHomeworkDialog.java index d95940f..fa4b937 100644 --- a/app/src/main/java/com/hjx/parent/dialog/AddHomeworkDialog.java +++ b/app/src/main/java/com/hjx/parent/dialog/AddHomeworkDialog.java @@ -16,6 +16,7 @@ import com.hjx.parent.R; import com.hjx.parent.bean.StudentBean; import com.hjx.parent.databinding.DialogAddHomeworkBinding; import com.hjx.parent.function.Function0; +import com.hjx.parent.function.Function1; import com.hjx.parent.rx.BaseRxActivity; import com.prws.common.bean.GradeAndSubject; import com.prws.common.bean.ResponseResult; @@ -42,9 +43,7 @@ import io.reactivex.schedulers.Schedulers; public class AddHomeworkDialog extends BaseDialog{ private final BaseRxActivity activity; - private Function0 callback; - - String stuId; + private Function1 callback; SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日", Locale.CHINA); List studentList; @@ -63,7 +62,7 @@ public class AddHomeworkDialog extends BaseDialog{ activity = context; } - public void show(List paths, Function0 callback) { + public void show(List paths, Function1 callback) { images = paths; this.callback = callback; super.show(); @@ -73,7 +72,6 @@ public class AddHomeworkDialog extends BaseDialog{ @Override public void initView() { binding.btnClose.setOnClickListener(v -> dismiss()); - stuId = getCurrentStuId(); binding.spStudent.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -153,6 +151,7 @@ public class AddHomeworkDialog extends BaseDialog{ if (data != null && data.size() > 0) { studentList = data; int position = 0; + String stuId = getCurrentStuId(); for (int i = 0; i < data.size(); i++) { if (data.get(i).stuId.equals(stuId)) { position = i; @@ -267,7 +266,7 @@ public class AddHomeworkDialog extends BaseDialog{ if (response != null && response.getSuccess()) { activity.cancelLoadingDialog(); dismiss(); - if (callback != null) callback.invoke(); + if (callback != null) callback.invoke(student); } else { activity.loadFail("上传作业失败"); } diff --git a/app/src/main/res/layout/activity_add_success.xml b/app/src/main/res/layout/activity_add_success.xml index 72a5fd3..3a95c0e 100644 --- a/app/src/main/res/layout/activity_add_success.xml +++ b/app/src/main/res/layout/activity_add_success.xml @@ -34,6 +34,7 @@ android:src="@mipmap/ic_add_success" />