diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 6d1ad88..0c0c338 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,20 +3,7 @@ - - - - - - - - - - - - - - + diff --git a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java index f25cdb9..061c614 100644 --- a/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java +++ b/app/src/main/java/com/hjx/parent/StuHomeworkActivity.java @@ -227,7 +227,7 @@ public class StuHomeworkActivity extends BaseRxActivity Observable.fromIterable(response.getData())) + .concatMap(response -> Observable.fromIterable(response.getData())) // 过滤 .filter(data -> { // 学科 String subject = state.subject.getValue(); 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 8ea5709..ee44376 100644 --- a/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java +++ b/app/src/main/java/com/hjx/parent/fragment/ErrorFragment.java @@ -284,7 +284,7 @@ public class ErrorFragment extends BaseRxFragment { .compose(RxLifecycleAndroid.bindFragment(getRxLifecycle())) .map(ResponseResult::getData) .toObservable() - .flatMap(Observable::fromIterable) + .concatMap(Observable::fromIterable) .filter(data -> subject.equals(data.getSubject())) .filter(data -> data.getRight() == null) .toList()