diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index cc18811..0c0c338 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,20 +3,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 7efc65b..ce4ce08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
applicationId "com.hjx.parent"
minSdk 26
targetSdk 32
- versionCode 1005
- versionName "1.0.0.5"
+ versionCode 1006
+ versionName "1.0.0.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
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 90b5487..b81b05a 100644
--- a/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
+++ b/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
@@ -33,6 +33,7 @@ import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
import com.hjx.parent.ErrorListActivity;
import com.hjx.parent.HomeworkDetailActivity;
+import com.hjx.parent.HomeworkShareActivity;
import com.hjx.parent.ImageActivity;
import com.hjx.parent.R;
import com.hjx.parent.StuHomeworkActivity;
@@ -46,6 +47,7 @@ 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.bean.homework.HomeworkList;
import com.prws.common.net.NetWorks;
import com.prws.common.utils.BitmapUtils;
import com.prws.common.utils.CommonUtil;
@@ -61,11 +63,13 @@ import com.zhangteng.imagepicker.imageloader.GlideImageLoader;
import com.zhangteng.utils.IHandlerCallBack;
import java.io.File;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import io.reactivex.Observable;
@@ -166,13 +170,25 @@ public class ErrorFragment extends BaseRxFragment {
errorAdapter = new ErrorAdapter(getActivity(), new ArrayList<>(), false);
homeworkAdapter = new HomeworkAdapter();
homeworkAdapter.setOnItemClickListener((baseQuickAdapter, view1, i) -> {
+ HomeworkList data = homeworkAdapter.getData().get(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);
+ if (data.getRight() == null) {
+ Intent intent = new Intent(requireContext(), HomeworkDetailActivity.class);
+ intent.putExtra("student", s);
+ intent.putExtra("data", data);
+ startActivity(intent);
+ } else {
+ Intent intent = new Intent(requireContext(), HomeworkShareActivity.class);
+ intent.putExtra("student", s);
+ intent.putExtra("id", data.getId());
+ intent.putExtra("grade", data.getGrade());
+ intent.putExtra("subject", data.getSubject());
+ String name1 = new SimpleDateFormat("yyyy年M月d日作业", Locale.CHINA).format(data.uploadTime);
+ intent.putExtra("name", name1);
+ startActivity(intent);
+ }
});
binding.rvMain.setAdapter(errorAdapter);
binding.tabLayout.addTab(binding.tabLayout.newTab().setText("最近错题"));
@@ -286,7 +302,8 @@ public class ErrorFragment extends BaseRxFragment {
.toObservable()
.concatMap(Observable::fromIterable)
.filter(data -> subject.equals(data.getSubject()))
- .filter(data -> data.getRight() == null)
+ //.filter(data -> data.getRight() == null)
+ .take(5)
.toList()
.subscribe((data, th) -> {
if (th != null) th.printStackTrace();