From 6449d025cc9629392efc2577c4a28cf94d2cedba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E6=89=8D?= <61060866@qq.com>
Date: Wed, 24 Apr 2024 11:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=B9=E8=BD=AF=E8=AF=B7=E6=B1=82=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nativedemo/face/FaceChatGreetingQueueCloseNameMode.java | 5 ++++-
 .../nativedemo/face/FaceChatGreetingQueueDSNewMode.java     | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueCloseNameMode.java b/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueCloseNameMode.java
index 371f5f3..b0b4b01 100644
--- a/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueCloseNameMode.java
+++ b/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueCloseNameMode.java
@@ -174,6 +174,7 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
             }
             start = System.currentTimeMillis();
             confirmCurrentPerson();
+            greeting();
             LogUtils.e("testface", " after filter mPersonsInScreen " + mPersonsInScreen.size() + "mUndeterminedPersonsInScreen " + mUndeterminedPersonsInScreen.size() + " confirmCurrentPerson duration " + (System.currentTimeMillis() - start));
             if (FaceManager.getInstance().isIntroduceVisitor()) {
                 PersonInfo person = null;
@@ -615,7 +616,6 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
         }
         //打招呼
         //clearGreeting();
-        greeting();
 
         //优先交互权
         //第二阶段 判断当前人
@@ -964,6 +964,9 @@ public class FaceChatGreetingQueueCloseNameMode implements ChatMode {
     }
 
     public void greeting() {
+        if (mPersonsInScreen.size() == 0 && mUndeterminedPersonsInScreen.size() == 0) {
+            return;
+        }
         int greetingType = greetingLeaveType;
         for (PersonInfo value : mPersonsInScreen) {
             // 是否有脸
diff --git a/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueDSNewMode.java b/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueDSNewMode.java
index 5148903..4d5d045 100644
--- a/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueDSNewMode.java
+++ b/app/src/main/java/com/aispeech/nativedemo/face/FaceChatGreetingQueueDSNewMode.java
@@ -171,6 +171,7 @@ public class FaceChatGreetingQueueDSNewMode implements ChatMode {
             }
             //LogUtils.e("testtrack", " after filter mPersonsInScreen " + mPersonsInScreen.size() +  "mUndeterminedPersonsInScreen " + mUndeterminedPersonsInScreen.size());
             confirmCurrentPerson();
+            greeting();
             if (FaceManager.getInstance().isIntroduceVisitor()) {
                 PersonInfo person = null;
                 if (mPersonsInScreen.size() > 0) {
@@ -612,7 +613,7 @@ public class FaceChatGreetingQueueDSNewMode implements ChatMode {
         //clearGreeting();
         //if (mSelectPerson == null)
         {
-            greeting();
+
         }
 
         //优先交互权
@@ -983,6 +984,9 @@ public class FaceChatGreetingQueueDSNewMode implements ChatMode {
     }
 
     public boolean greeting() {
+        if (mPersonsInScreen.size() == 0 && mUndeterminedPersonsInScreen.size() == 0) {
+            return false;
+        }
         if (!WebSocketManager.getInstance(DuiApplication.getContext()).isSocketOpen() && !MessageUtils.isUseJSBridge()) {
             return false;
         }