From b4fcef1ced1dc6c7b06b387d9ba849ae92a4c025 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Sun, 5 Nov 2023 10:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BA=8B=E4=BB=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojos/ConferenceCreateEvent.java | 5 +++++ .../pojos/ConferenceDestroyEvent.java | 5 +++++ .../pojos/ConferenceJoinEvent.java | 5 +++++ .../pojos/ConferenceLeaveEvent.java | 5 +++++ .../pojos/ConferencePublishEvent.java | 5 +++++ .../pojos/ConferenceUnpublishEvent.java | 5 +++++ .../main/java/cn/wildfirechat/sdk/Main.java | 18 ++++++------------ 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/cn/wildfirechat/pojos/ConferenceCreateEvent.java b/common/src/main/java/cn/wildfirechat/pojos/ConferenceCreateEvent.java index 3ae78904..2fc2d529 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/ConferenceCreateEvent.java +++ b/common/src/main/java/cn/wildfirechat/pojos/ConferenceCreateEvent.java @@ -10,4 +10,9 @@ public class ConferenceCreateEvent { public int bitrate; public boolean advance; public boolean recording; + public long timestamp; + + public ConferenceCreateEvent() { + timestamp = System.currentTimeMillis(); + } } diff --git a/common/src/main/java/cn/wildfirechat/pojos/ConferenceDestroyEvent.java b/common/src/main/java/cn/wildfirechat/pojos/ConferenceDestroyEvent.java index d415435e..774b8e5c 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/ConferenceDestroyEvent.java +++ b/common/src/main/java/cn/wildfirechat/pojos/ConferenceDestroyEvent.java @@ -3,4 +3,9 @@ package cn.wildfirechat.pojos; public class ConferenceDestroyEvent { public String userId; public String roomId; + public long timestamp; + + public ConferenceDestroyEvent() { + timestamp = System.currentTimeMillis(); + } } diff --git a/common/src/main/java/cn/wildfirechat/pojos/ConferenceJoinEvent.java b/common/src/main/java/cn/wildfirechat/pojos/ConferenceJoinEvent.java index 2f2822a4..ce93e47b 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/ConferenceJoinEvent.java +++ b/common/src/main/java/cn/wildfirechat/pojos/ConferenceJoinEvent.java @@ -4,4 +4,9 @@ public class ConferenceJoinEvent { public String userId; public String roomId; public boolean screenSharing; + public long timestamp; + + public ConferenceJoinEvent() { + timestamp = System.currentTimeMillis(); + } } diff --git a/common/src/main/java/cn/wildfirechat/pojos/ConferenceLeaveEvent.java b/common/src/main/java/cn/wildfirechat/pojos/ConferenceLeaveEvent.java index 8bca755c..a383f1ca 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/ConferenceLeaveEvent.java +++ b/common/src/main/java/cn/wildfirechat/pojos/ConferenceLeaveEvent.java @@ -6,4 +6,9 @@ public class ConferenceLeaveEvent { public boolean rejoin; public boolean kicked; public boolean screenSharing; + public long timestamp; + + public ConferenceLeaveEvent() { + timestamp = System.currentTimeMillis(); + } } diff --git a/common/src/main/java/cn/wildfirechat/pojos/ConferencePublishEvent.java b/common/src/main/java/cn/wildfirechat/pojos/ConferencePublishEvent.java index 042fd2dc..25597f0f 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/ConferencePublishEvent.java +++ b/common/src/main/java/cn/wildfirechat/pojos/ConferencePublishEvent.java @@ -5,4 +5,9 @@ public class ConferencePublishEvent { public boolean video; public String roomId; public boolean screenSharing; + public long timestamp; + + public ConferencePublishEvent() { + timestamp = System.currentTimeMillis(); + } } diff --git a/common/src/main/java/cn/wildfirechat/pojos/ConferenceUnpublishEvent.java b/common/src/main/java/cn/wildfirechat/pojos/ConferenceUnpublishEvent.java index c79f1a05..244336a2 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/ConferenceUnpublishEvent.java +++ b/common/src/main/java/cn/wildfirechat/pojos/ConferenceUnpublishEvent.java @@ -4,4 +4,9 @@ public class ConferenceUnpublishEvent { public String userId; public String roomId; public boolean screenSharing; + public long timestamp; + + public ConferenceUnpublishEvent() { + timestamp = System.currentTimeMillis(); + } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java index cf910910..95cdf964 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java @@ -300,18 +300,12 @@ public class Main { System.exit(-1); } - int limit = 5; - for (int i = 0; i < 100; i++) { - IMResult getUserListIMResult = UserAdmin.getAllUsers(limit, i*limit); - if (getUserListIMResult != null && getUserListIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("getUserListIMResult success"); - if(getUserListIMResult.getResult().userInfoList.size() < limit) { - break; - } - } else { - System.out.println("getUserListIMResult failure"); - System.exit(-1); - } + IMResult getUserListIMResult = UserAdmin.getAllUsers(100, 0); + if (getUserListIMResult != null && getUserListIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("getUserListIMResult success"); + } else { + System.out.println("getUserListIMResult failure"); + System.exit(-1); } if (commercialServer) {