diff --git a/common/src/main/java/cn/wildfirechat/common/IMExceptionEvent.java b/common/src/main/java/cn/wildfirechat/common/IMExceptionEvent.java index 607838d7..09135728 100644 --- a/common/src/main/java/cn/wildfirechat/common/IMExceptionEvent.java +++ b/common/src/main/java/cn/wildfirechat/common/IMExceptionEvent.java @@ -11,6 +11,7 @@ public class IMExceptionEvent { int ROBOT_API_Exception = 7; int SHORT_LINK_Exception = 8; int EVENT_CALLBACK_Exception = 9; + int CONFERENCE_Exception = 10; int HEART_BEAT = 100; } diff --git a/common/src/main/java/cn/wildfirechat/pojos/PojoConferenceRoomId.java b/common/src/main/java/cn/wildfirechat/pojos/PojoConferenceRoomId.java new file mode 100644 index 00000000..1b9bae61 --- /dev/null +++ b/common/src/main/java/cn/wildfirechat/pojos/PojoConferenceRoomId.java @@ -0,0 +1,14 @@ +package cn.wildfirechat.pojos; + +public class PojoConferenceRoomId { + public String roomId; + public boolean advance; + + public PojoConferenceRoomId() { + } + + public PojoConferenceRoomId(String roomId, boolean advance) { + this.roomId = roomId; + this.advance = advance; + } +} diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/ConferenceAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/ConferenceAdmin.java index fc6ed82d..7a8909fa 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/ConferenceAdmin.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/ConferenceAdmin.java @@ -11,9 +11,10 @@ public class ConferenceAdmin { return AdminHttpUtils.httpJsonPost(path, null, PojoConferenceInfoList.class); } - public static IMResult listParticipants(String roomId) throws Exception { + public static IMResult listParticipants(String roomId, boolean advance) throws Exception { String path = APIPath.Conference_List_Participant; - return AdminHttpUtils.httpJsonPost(path, roomId, PojoConferenceParticipantList.class); + PojoConferenceRoomId data = new PojoConferenceRoomId(roomId, advance); + return AdminHttpUtils.httpJsonPost(path, data, PojoConferenceParticipantList.class); } public static IMResult createRoom(String roomId, String description, String pin, int maxPublisher, boolean advance, int bitrate, boolean recording) throws Exception { @@ -29,8 +30,9 @@ public class ConferenceAdmin { return AdminHttpUtils.httpJsonPost(path, create, Void.class); } - public static IMResult destroy(String roomId) throws Exception { + public static IMResult destroy(String roomId, boolean advance) throws Exception { String path = APIPath.Conference_Destroy; - return AdminHttpUtils.httpJsonPost(path, roomId, Void.class); + PojoConferenceRoomId conferenceRoomId = new PojoConferenceRoomId(roomId, advance); + return AdminHttpUtils.httpJsonPost(path, conferenceRoomId, Void.class); } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/GeneralAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/GeneralAdmin.java index 52cbe89d..58e014e0 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/GeneralAdmin.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/GeneralAdmin.java @@ -43,7 +43,8 @@ public class GeneralAdmin { out.result = result.result != null && "1".equals(result.result.getValue()); return out; } - + + public static IMResult getUserSetting(String userId, int scope, String key) throws Exception { String path = APIPath.User_Get_Setting; UserSettingPojo pojo = new UserSettingPojo(); diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java index a60838e1..b545b4bf 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java @@ -1302,6 +1302,8 @@ public class Main { System.exit(-1); } + Thread.sleep(100); + IMResult swResult = SensitiveAdmin.getSensitives(); if (swResult != null && swResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && swResult.getResult().getWords().containsAll(words)) { System.out.println("Sensitive word added"); @@ -1318,6 +1320,7 @@ public class Main { System.exit(-1); } + Thread.sleep(100); swResult = SensitiveAdmin.getSensitives(); if (swResult != null && swResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !swResult.getResult().getWords().containsAll(words)) { System.out.println("Sensitive word removed"); @@ -1384,7 +1387,7 @@ public class Main { } for (PojoConferenceInfo conferenceInfo:listResult.getResult().conferenceInfoList) { - IMResult destroyResult = ConferenceAdmin.destroy(conferenceInfo.roomId); + IMResult destroyResult = ConferenceAdmin.destroy(conferenceInfo.roomId, conferenceInfo.advance); if(destroyResult == null || destroyResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) { System.out.println("destroy room failure"); System.exit(-1); @@ -1401,9 +1404,17 @@ public class Main { System.out.println("conference list " + listResult.getResult().conferenceInfoList); } - IMResult createResult = ConferenceAdmin.createRoom("helloroomid", "hello room description", "123456", 20, false, 0, false); + IMResult createResult = ConferenceAdmin.createRoom("helloroomid", "hello room description", "123456", 9, false, 0, false); if(createResult == null || createResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("create conference list failure"); + System.out.println("create conference failure"); + System.exit(-1); + } else { + System.out.println("create conference"); + } + + createResult = ConferenceAdmin.createRoom("helloroomid2", "hello room description advanced", "123456", 20, true, 0, false); + if(createResult == null || createResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("create conference failure"); System.exit(-1); } else { System.out.println("create conference"); @@ -1418,12 +1429,12 @@ public class Main { } for (PojoConferenceInfo conferenceInfo:listResult.getResult().conferenceInfoList) { - IMResult listParticipantsResult = ConferenceAdmin.listParticipants(conferenceInfo.roomId); + IMResult listParticipantsResult = ConferenceAdmin.listParticipants(conferenceInfo.roomId, conferenceInfo.advance); if(listParticipantsResult == null || listParticipantsResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("destroy room failure"); + System.out.println("list participants failure"); System.exit(-1); } else { - System.out.println("destroy room success"); + System.out.println("list participants success"); } } }