首页

shixianjie
1 parent 937d37ac8b
Showing 2 changed files with 14 additions and 6 deletions Show diff stats
app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java
app/src/main/res/layout/fragment_error_book.xml
@@ -66,6 +66,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import io.reactivex.Observable;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -141,10 +142,12 @@ public class ErrorFragment extends BaseRxFragment&lt;FragmentErrorBookBinding&gt; {
                     if (subject != item.getAdapterPosition()) {
                         subject = item.getAdapterPosition();
                         String subStr = getResources().getStringArray(R.array.filter_subject)[subject];
+                        getError(subStr);
+                        getHomework(subStr);
                         if (binding.tabLayout.getSelectedTabPosition() == 0) {
-                            getError(subStr);
+                            binding.tvListTitle.setText("最近错题");
                         } else {
-                            // nothing can do
+                            binding.tvListTitle.setText("最近作业");
                         }
                     }
                 });
@@ -263,13 +266,17 @@ public class ErrorFragment extends BaseRxFragment&lt;FragmentErrorBookBinding&gt; {
     }
  
     @SuppressLint("CheckResult")
-    protected void getHomework() {
+    protected void getHomework(String subject) {
         if (studentBean == null) return;
         NetWorks.service_url.getStudentHomework(NetWorks.getHeader(), studentBean.getStuId())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(RxLifecycleAndroid.bindFragment(getRxLifecycle()))
                 .map(ResponseResult::getData)
+                .toObservable()
+                .flatMap(Observable::fromIterable)
+                .filter(data -> subject.equals(data.getSubject()))
+                .toList()
                 .subscribe((data, th) -> {
                     if (th != null) th.printStackTrace();
                     if (data != null) {
@@ -321,8 +328,9 @@ public class ErrorFragment extends BaseRxFragment&lt;FragmentErrorBookBinding&gt; {
     @Override
     public void onResume() {
         super.onResume();
-        getError(getResources().getStringArray(R.array.filter_subject)[subject]);
-        getHomework();
+        String subStr = getResources().getStringArray(R.array.filter_subject)[subject];
+        getError(subStr);
+        getHomework(subStr);
     }
  
     public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
@@ -137,7 +137,7 @@
                 android:id="@+id/tvListTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="最近录入错题"
+                android:text="最近错题"
                 android:textColor="#333333"
                 android:textSize="16sp"
                 android:textStyle="bold" />
...	...	@@ -66,6 +66,7 @@ import java.util.HashMap;
66	66	import java.util.List;
67	67	import java.util.Map;
68	68
	69	+import io.reactivex.Observable;
69	70	import io.reactivex.Observer;
70	71	import io.reactivex.android.schedulers.AndroidSchedulers;
71	72	import io.reactivex.disposables.Disposable;
...	...	@@ -141,10 +142,12 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
141	142	if (subject != item.getAdapterPosition()) {
142	143	subject = item.getAdapterPosition();
143	144	String subStr = getResources().getStringArray(R.array.filter_subject)[subject];
	145	+ getError(subStr);
	146	+ getHomework(subStr);
144	147	if (binding.tabLayout.getSelectedTabPosition() == 0) {
145		- getError(subStr);
	148	+ binding.tvListTitle.setText("最近错题");
146	149	} else {
147		- // nothing can do
	150	+ binding.tvListTitle.setText("最近作业");
148	151	}
149	152	}
150	153	});
...	...	@@ -263,13 +266,17 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
263	266	}
264	267
265	268	@SuppressLint("CheckResult")
266		- protected void getHomework() {
	269	+ protected void getHomework(String subject) {
267	270	if (studentBean == null) return;
268	271	NetWorks.service_url.getStudentHomework(NetWorks.getHeader(), studentBean.getStuId())
269	272	.subscribeOn(Schedulers.io())
270	273	.observeOn(AndroidSchedulers.mainThread())
271	274	.compose(RxLifecycleAndroid.bindFragment(getRxLifecycle()))
272	275	.map(ResponseResult::getData)
	276	+ .toObservable()
	277	+ .flatMap(Observable::fromIterable)
	278	+ .filter(data -> subject.equals(data.getSubject()))
	279	+ .toList()
273	280	.subscribe((data, th) -> {
274	281	if (th != null) th.printStackTrace();
275	282	if (data != null) {
...	...	@@ -321,8 +328,9 @@ public class ErrorFragment extends BaseRxFragment<FragmentErrorBookBinding> {
321	328	@Override
322	329	public void onResume() {
323	330	super.onResume();
324		- getError(getResources().getStringArray(R.array.filter_subject)[subject]);
325		- getHomework();
	331	+ String subStr = getResources().getStringArray(R.array.filter_subject)[subject];
	332	+ getError(subStr);
	333	+ getHomework(subStr);
326	334	}
327	335
328	336	public class HandlerCallBack implements IHandlerCallBack<ImageInfo> {
...	...
...	...	@@ -137,7 +137,7 @@
137	137	android:id="@+id/tvListTitle"
138	138	android:layout_width="wrap_content"
139	139	android:layout_height="wrap_content"
140		- android:text="最近录入错题"
	140	+ android:text="最近错题"
141	141	android:textColor="#333333"
142	142	android:textSize="16sp"
143	143	android:textStyle="bold" />
...	...