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