From 68ea67b7a0046ba42c8c42cbae7e37f3a71a2273 Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 26 Oct 2021 19:55:51 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E4=BA=86SOS=E7=9A=84=E6=8B=A8?=
 =?utf8?q?=E5=8F=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/ic/sos/SOSPresenter.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/ic/sos/SOSPresenter.java b/app/src/main/java/com/ic/sos/SOSPresenter.java
index 53c44af..ea998c1 100644
--- a/app/src/main/java/com/ic/sos/SOSPresenter.java
+++ b/app/src/main/java/com/ic/sos/SOSPresenter.java
@@ -124,8 +124,14 @@ public class SOSPresenter {
             boolean isLastOne = currentCallIndex == phoneNumList.size() - 1;
             //是否有拨通hasRemoteAnswer
             boolean isLastLoop = currentLoopGroupTime == loopTime;
+            ICLogger.d("isLastOne ==> " + isLastOne);
+            ICLogger.d("hasRemoteAnswer ==> " + hasRemoteAnswer);
             //有接听的，拨完这轮，没接听的，一直拨到最后一轮
-            doCallNext = (hasRemoteAnswer && !isLastOne) || !isLastLoop;
+            if (hasRemoteAnswer) {
+                doCallNext = !isLastOne;
+            } else {
+                doCallNext = !isLastLoop;
+            }
         } else if ("loop".equals(callWay)) {
             //连续拨打完目标轮询组的次数
             doCallNext = currentLoopGroupTime != loopTime;
@@ -151,6 +157,7 @@ public class SOSPresenter {
             handler.postDelayed(this::doSosCall, 1000);
         } else {
             ICLogger.d("结束界面...");
+            hasRemoteAnswer = false;
             stateValue.postValue(SOSState.FINISH);
         }
     }
-- 
2.17.1