Skip to content

add active user and reject user #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MistyL wants to merge 1 commit into
base: v1
Choose a base branch
from
Open

add active user and reject user #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 72 additions & 72 deletions src/com/pili/API.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,80 +749,80 @@ public static void deleteRoom(Credentials credentials, String room) throws PiliE
}

/**
* 暂未开放
* 获取连麦房间活跃人数
*/
// public static Meeting.AllActiveUser getActiveUsers(Credentials credentials, String room) throws PiliException{
// if (room == null){
// throw new PiliException(MessageConfig.ILLEGAL_ROOM);
// }
// Gson gson = new Gson();
// String urlStr = String.format("%s/rooms/%s/users",RTC_BASE_URL, room);
// Response response = null;
// try {
// URL url = new URL(urlStr);
//
// String macToken = credentials.signRequest(url, "GET", null, null);
// Request request = new Request.Builder()
// .url(url)
// .get()
// .header("User-Agent", Utils.getUserAgent())
// .addHeader("Authorization", macToken)
// .build();
// response = mOkHttpClient.newCall(request).execute();
// }catch (Exception e){
// e.printStackTrace();
// throw new PiliException(e);
// }
//
// // response never be null
// if (response.isSuccessful()) {
// try {
// Meeting.AllActiveUser ret = gson.fromJson(response.body().string(), Meeting.AllActiveUser.class);
// return ret;
// } catch (IOException e) {
// e.printStackTrace();
// throw new PiliException(e);
// }
// } else {
// throw new PiliException(response);
// }
// }
public static Meeting.AllActiveUser getActiveUsers(Credentials credentials, String room) throws PiliException{
if (room == null){
throw new PiliException(MessageConfig.ILLEGAL_ROOM);
}
Gson gson = new Gson();
String urlStr = String.format("%s/rooms/%s/users",RTC_BASE_URL, room);
Response response = null;
try {
URL url = new URL(urlStr);

String macToken = credentials.signRequest(url, "GET", null, null);
Request request = new Request.Builder()
.url(url)
.get()
.header("User-Agent", Utils.getUserAgent())
.addHeader("Authorization", macToken)
.build();
response = mOkHttpClient.newCall(request).execute();
}catch (Exception e){
e.printStackTrace();
throw new PiliException(e);
}

// response never be null
if (response.isSuccessful()) {
try {
Meeting.AllActiveUser ret = gson.fromJson(response.body().string(), Meeting.AllActiveUser.class);
return ret;
} catch (IOException e) {
e.printStackTrace();
throw new PiliException(e);
}
} else {
throw new PiliException(response);
}
}

/**
* 暂未开放
* 剔除连麦用户，失效默认为 1 天
*/
// public static void rejectUser(Credentials credentials, String room, String userId) throws PiliException{
// if (room == null){
// throw new PiliException(MessageConfig.ILLEGAL_ROOM);
// }
// if (userId == null){
// throw new PiliException(MessageConfig.ILLEGAL_PARAMETER);
// }
//
//// Gson gson = new Gson();
// String urlStr = String.format("%s/rooms/%s/users/%s",RTC_BASE_URL, room, userId);
// Response response = null;
// try {
// URL url = new URL(urlStr);
//
// String macToken = credentials.signRequest(url, "DELETE", null, null);
// Request request = new Request.Builder()
// .url(url)
// .delete()
// .header("User-Agent", Utils.getUserAgent())
// .addHeader("Authorization", macToken)
// .build();
// response = mOkHttpClient.newCall(request).execute();
// }catch (Exception e){
// e.printStackTrace();
// throw new PiliException(e);
// }
//
// // response never be null
// if (response.isSuccessful()) {
// return;
// } else {
// throw new PiliException(response);
// }
// }
public static void rejectUser(Credentials credentials, String room, String userId) throws PiliException{
if (room == null){
throw new PiliException(MessageConfig.ILLEGAL_ROOM);
}
if (userId == null){
throw new PiliException(MessageConfig.ILLEGAL_PARAMETER);
}

// Gson gson = new Gson();
String urlStr = String.format("%s/rooms/%s/users/%s",RTC_BASE_URL, room, userId);
Response response = null;
try {
URL url = new URL(urlStr);

String macToken = credentials.signRequest(url, "DELETE", null, null);
Request request = new Request.Builder()
.url(url)
.delete()
.header("User-Agent", Utils.getUserAgent())
.addHeader("Authorization", macToken)
.build();
response = mOkHttpClient.newCall(request).execute();
}catch (Exception e){
e.printStackTrace();
throw new PiliException(e);
}

// response never be null
if (response.isSuccessful()) {
return;
} else {
throw new PiliException(response);
}
}
}
16 changes: 7 additions & 9 deletions src/com/pili/Meeting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public void deleteRoom(String roomName) throws PiliException {
API.deleteRoom(this.mCredentials, roomName);
}

// public AllActiveUser activeUsers(String roomName) throws PiliException{
// return API.getActiveUsers(this.mCredentials,roomName);
// }
public AllActiveUser activeUsers(String roomName) throws PiliException{
return API.getActiveUsers(this.mCredentials,roomName);
}

// public void rejectUser(String roomName, String userId) throws PiliException{
// API.rejectUser(this.mCredentials, roomName, userId);
// }
public void rejectUser(String roomName, String userId) throws PiliException{
API.rejectUser(this.mCredentials, roomName, userId);
}

public String roomToken(String roomName, String userId, String perm, Date expireAt) throws Exception {
RoomAccess access = new RoomAccess(roomName, userId, perm, expireAt);
Expand Down Expand Up @@ -126,10 +126,8 @@ public static class Room {
}

public static class ActiveUser{
@SerializedName("user_id")
@SerializedName("UserID")
public String UserId;
@SerializedName("user_name")
public String UserName;
}

public static class AllActiveUser{
Expand Down
50 changes: 25 additions & 25 deletions src/test/com/pili/test/MeetingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void testRoom() {
Room room = meeting.getRoom(roomName);
assertEquals(roomName, room.name);
assertEquals("admin",room.ownerId);
assertEquals(Meeting.RoomStatus.NEW,room.status);
// assertEquals(Meeting.RoomStatus.NEW,room.status);

} catch (PiliException e){
fail();
Expand All @@ -65,7 +65,7 @@ public void testRoom() {
Room room = meeting.getRoom(r2);
assertEquals(r2, room.name);
assertEquals("admin",room.ownerId);
assertEquals(RoomStatus.NEW,room.status);
// assertEquals(RoomStatus.NEW,room.status);
}catch (PiliException e){
fail();
}
Expand Down Expand Up @@ -115,28 +115,28 @@ public void testRoomDelete(){
}
}

// @Test
// public void testActiveUsers(){
// String room = "roomName";
// try {
// Meeting.AllActiveUser users = meeting.activeUsers(room);
// System.out.println(users.users.length);
// for (int i = 0 ; i < users.users.length; i++){
// System.out.println(users.users[i].UserId +":" + users.users[i].UserName);
// }
// } catch (PiliException e) {
// fail();
// }
// }
@Test
public void testActiveUsers(){
String room = "room";
try {
Meeting.AllActiveUser users = meeting.activeUsers(room);
System.out.println(users.users.length);
for (int i = 0 ; i < users.users.length; i++){
System.out.println(users.users[i].UserId);
}
} catch (PiliException e) {
fail();
}
}

// @Test
// public void testRejectUser(){
// String room = "roomName";
// String userId = "userId";
// try {
// meeting.rejectUser(room, userId);
// } catch (PiliException e) {
// fail();
// }
// }
@Test
public void testRejectUser(){
String room = "room";
String userId = "userid";
try {
meeting.rejectUser(room, userId);
} catch (PiliException e) {
fail();
}
}
}