From e253e5291b8fc0b1f01b6102630749a446530aba Mon Sep 17 00:00:00 2001
From: shixianjie <shixianjie@hjx.com>
Date: Thu, 10 Oct 2024 10:01:19 +0800
Subject: [PATCH] =?UTF-8?q?flatMap=E6=94=B9=E4=B8=BAconcatMap,=20=E6=9C=89?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=98=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml                        | 15 +--------------
 app/src/main/java/com/hjx/parent/StuHomeworkActivity.java |  2 +-
 .../main/java/com/hjx/parent/fragment/ErrorFragment.java  |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

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 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <runningDeviceTargetSelectedWithDropDown>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="192.168.3.176:35119" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-10-09T03:21:59.277023400Z" />
-        </State>
+        <State />
       </entry>
     </value>
   </component>
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<ActivityStudentHomeworkB
                 .observeOn(AndroidSchedulers.mainThread())
                 .compose(RxLifecycleAndroid.bindActivity(getRxLifecycle()))
                 .toObservable()
-                .flatMap(response -> 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<FragmentErrorBookBinding> {
                 .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()
-- 
1.9.0