Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@hrxiang
hrxiang committed Jun 30, 2022
1 parent 6d0c001 commit 5d60f24
Show file tree
Hide file tree
Showing 34 changed files with 564 additions and 79 deletions.
2 changes: 1 addition & 1 deletion OpenIM-SDK/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

implementation 'io.openim:core-sdk:2.0.9.23@aar'
implementation 'io.openim:core-sdk:2.1.0.2@aar'
implementation 'com.google.code.gson:gson:2.9.0'
}
28 changes: 23 additions & 5 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupAtType.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
package io.openim.android.sdk.enums;


/**
* 会话强提醒
*/
public class GroupAtType {
public static final int atNormal = 0;
public static final int atMe = 1;
public static final int atAll = 2;
public static final int atAllAtMe = 3;
/**
* 清除所有
*/
public static final int AT_NORMAL = 0;
/**
* at我
*/
public static final int AT_ME = 1;
/**
* at所有人
*/
public static final int AT_ALL = 2;
/**
* at所有人，at我
*/
public static final int AT_ALL_AT_ME = 3;
/**
* 群公告提示
*/
public static final int GROUP_NOTIFICATION = 4;
}
21 changes: 21 additions & 0 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupVerification.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.openim.android.sdk.enums;

/**
* 进群验证方式
*/
public class GroupVerification {
/**
* 申请需要同意 邀请直接进
*/
static final int APPLY_NEED_VERIFICATION_INVITE_DIRECTLY = 0;

/**
* 所有人进群需要验证，除了群主管理员邀
*/
static final int ALL_NEED_VERIFICATION = 1;

/**
* 直接进群
*/
static final int DIRECTLY = 2;
}
16 changes: 8 additions & 8 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/MessageType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@ public class MessageType {
public static final int NOTIFICATION_BEGIN = 1000;

public static final int FRIEND_NOTIFICATION_BEGIN = 1200;
public static final int FRIEND_APPLICATION_APPROVED_NOTIFICATION = 1201; //add_friend_response
public static final int FRIEND_APPLICATION_REJECTED_NOTIFICATION = 1202; //add_friend_response
public static final int FRIEND_APPLICATION_NOTIFICATION = 1203; //add_friend
public static final int FRIEND_APPLICATION_APPROVED_NOTIFICATION = 1201;
public static final int FRIEND_APPLICATION_REJECTED_NOTIFICATION = 1202;
public static final int FRIEND_APPLICATION_NOTIFICATION = 1203;
public static final int FRIEND_ADDED_NOTIFICATION = 1204;
public static final int FRIEND_DELETED_NOTIFICATION = 1205; //delete_friend
public static final int FRIEND_REMARK_SET_NOTIFICATION = 1206; //set_friend_remark
public static final int BLACK_ADDED_NOTIFICATION = 1207; //add_black
public static final int BLACK_DELETED_NOTIFICATION = 1208; //remove_black
public static final int FRIEND_DELETED_NOTIFICATION = 1205;
public static final int FRIEND_REMARK_SET_NOTIFICATION = 1206;
public static final int BLACK_ADDED_NOTIFICATION = 1207;
public static final int BLACK_DELETED_NOTIFICATION = 1208;
public static final int FRIEND_NOTIFICATION_END = 1299;

public static final int CONVERSATION_CHANGE_NOTIFICATION = 1300;

public static final int USER_NOTIFICATION_BEGIN = 1301;
public static final int USERINFO_UPDATED_NOTIFICATION = 1303; //SetSelfInfoTip
public static final int USERINFO_UPDATED_NOTIFICATION = 1303;
public static final int USER_NOTIFICATION_END = 1399;

public static final int OA_NOTIFICATION = 1400;
Expand Down
13 changes: 2 additions & 11 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,6 @@ public void pinConversation(OnBase<String> base, String conversationID, boolean
Open_im_sdk.pinConversation(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), conversationID, isPinned);
}

/**
* 标记单聊会话为已读
*
* @param userID 单聊对象ID
* @param base callback String
*/
/*public void markSingleMessageHasRead(OnBase<String> base, String userID) {
Open_im_sdk.markSingleMessageHasRead(BaseImpl.stringBase(base), userID);
}*/

/**
* 标记群组会话已读
*
Expand Down Expand Up @@ -208,10 +198,11 @@ public String getAtAllTag() {
*
* @param status 状态 1:屏蔽消息; 2:接收消息但不提示; 0:正常
*/
public void resetConversationGroupAtType(OnBase<String> base, long status) {
public void setGlobalRecvMessageOpt(OnBase<String> base, long status) {
Open_im_sdk.setGlobalRecvMessageOpt(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), status);
}


/**
* 会话排序比较器
*/
Expand Down
24 changes: 24 additions & 0 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/GroupManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,4 +285,28 @@ public void searchGroups(OnBase<List<GroupInfo>> base, List<String> keywordList,
public void setGroupMemberRoleLevel(OnBase<String> base, String groupID, String userID, long roleLevel) {
Open_im_sdk.setGroupMemberRoleLevel(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), groupID, userID, roleLevel);
}

/**
* 根据加入时间分页获取组成员列表
*
* @param groupID 组ID号
* @param offset 开始下标
* @param count 每页大小
* @param joinTimeBegin 加入开始时间
* @param joinTimeEnd 加入结束时间
* @param excludeUserIDList 排除的用户
*/
public void getGroupMemberListByJoinTime(OnBase<List<GroupMembersInfo>> base, String groupID, int offset, int count, long joinTimeBegin, long joinTimeEnd, List<String> excludeUserIDList) {
Open_im_sdk.getGroupMemberListByJoinTimeFilter(BaseImpl.arrayBase(base, GroupMembersInfo.class), ParamsUtil.buildOperationID(), groupID, offset, count, joinTimeBegin, joinTimeEnd, JsonUtil.toString(excludeUserIDList));
}

/**
* 设置进群验证
*
* @param groupID 组ID号
* @param needVerification {@link io.openim.android.sdk.enums.GroupVerification}
*/
public void setGroupVerification(OnBase<String> base, String groupID, int needVerification) {
Open_im_sdk.setGroupVerification(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), groupID, needVerification);
}
}
3 changes: 3 additions & 0 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/WorkMomentsManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import io.openim.android.sdk.utils.ParamsUtil;
import open_im_sdk.Open_im_sdk;

/**
* 工作圈/朋友圈
*/
public class WorkMomentsManager {

public void setWorkMomentsListener(OnWorkMomentsListener listener) {
Expand Down
9 changes: 9 additions & 0 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtUserInfo.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
package io.openim.android.sdk.models;

/**
* at消息 userID跟nickname映射关系
*/
public class AtUserInfo {
/**
* 被at的用户的id
*/
private String atUserID;
/**
* 被at的用户的昵称
*/
private String groupNickname;

public String getAtUserID() {
Expand Down
9 changes: 9 additions & 0 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AttachedInfoElem.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
package io.openim.android.sdk.models;

public class AttachedInfoElem {
/**
* 组信息已读详细
*/
private GroupHasReadInfo groupHasReadInfo;
/**
* 是否是私聊消息（阅后即焚消息）
*/
private boolean isPrivateChat;
/**
* 消息已读时间
*/
private long hasReadTime;

public GroupHasReadInfo getGroupHasReadInfo() {
Expand Down
43 changes: 35 additions & 8 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/models/BlacklistInfo.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@
package io.openim.android.sdk.models;

/**
* 黑名单详细
*/
public class BlacklistInfo {
String userID;
String nickname;
String faceURL;
int gender;
long createTime;
int addSource;
String operatorUserID;
String ex;
/**
* 用户id
*/
private String userID;
/**
* 昵称
*/
private String nickname;
/**
* 头像
*/
private String faceURL;
/**
* 性别
*/
private int gender;
/**
* 创建时间
*/
private long createTime;
/**
* 添加方式
*/
private int addSource;
/**
* 操作者
*/
private String operatorUserID;
/**
* 附加信息
*/
private String ex;

public String getUserID() {
return userID;
Expand Down
9 changes: 6 additions & 3 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ConversationInfo {
private String faceURL;
/**
* 接收消息选项：<br/>
* 0:在线正常接收消息，离线时进行推送<br/>
* 0:在线正常接收消息，离线时进行推送 <br/>
* 1:不会接收到消息<br/>
* 2:在线正常接收消息，离线不会有推送
*/
Expand All @@ -37,15 +37,15 @@ public class ConversationInfo {
*/
private int unreadCount;
/**
*
* 强提示 如at消息，公告 {@link io.openim.android.sdk.enums.GroupAtType}
*/
private int groupAtType;
/**
* 最后一条消息 消息对象json字符串
*/
private String latestMsg;
/**
* 最后一条消息发送时间(ns)
* 最后一条消息发送时间(ms)
*/
private long latestMsgSendTime;
/**
Expand All @@ -69,6 +69,9 @@ public class ConversationInfo {
*/
private String ext;

/**
* 是否还在群里
* */
private boolean isNotInGroup;


Expand Down
33 changes: 33 additions & 0 deletions OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,49 @@
* 部门信息
*/
public class DeptInfo {
/**
* 部门id
*/
private String departmentID;
/**
* 头像
*/
private String faceURL;
/**
* 名称
*/
private String name;
/**
* 上一级id
*/
private String parentID;
/**
* 排序
*/
private int order;
/**
* 部门类型
*/
private int departmentType;
/**
* 创建时间
*/
private long createTime;
/**
* 子部门数量
*/
private int subDepartmentNum;
/**
* 成员数量
*/
private int memberNum;
/**
* 附加字段
*/
private String ex;
/**
* 附加信息
*/
private String attachedInfo;

public String getDepartmentID() {
Expand Down

0 comments on commit 5d60f24

Please sign in to comment.