diff --git a/OpenIM-SDK/build.gradle b/OpenIM-SDK/build.gradle index 38a7a9f..bdbe596 100644 --- a/OpenIM-SDK/build.gradle +++ b/OpenIM-SDK/build.gradle @@ -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' } diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupAtType.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupAtType.java index 51b2ce6..76a390f 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupAtType.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupAtType.java @@ -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; } diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupVerification.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupVerification.java new file mode 100644 index 0000000..e933cfe --- /dev/null +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/GroupVerification.java @@ -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; +} diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/MessageType.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/MessageType.java index 471399b..febf99d 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/MessageType.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/enums/MessageType.java @@ -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; diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java index 1b26455..8bdd9f6 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/ConversationManager.java @@ -104,16 +104,6 @@ public void pinConversation(OnBase 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 base, String userID) { - Open_im_sdk.markSingleMessageHasRead(BaseImpl.stringBase(base), userID); - }*/ - /** * 标记群组会话已读 * @@ -208,10 +198,11 @@ public String getAtAllTag() { * * @param status 状态 1:屏蔽消息; 2:接收消息但不提示; 0:正常 */ - public void resetConversationGroupAtType(OnBase base, long status) { + public void setGlobalRecvMessageOpt(OnBase base, long status) { Open_im_sdk.setGlobalRecvMessageOpt(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), status); } + /** * 会话排序比较器 */ diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/GroupManager.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/GroupManager.java index 1ffb570..0d56766 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/GroupManager.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/GroupManager.java @@ -285,4 +285,28 @@ public void searchGroups(OnBase> base, List keywordList, public void setGroupMemberRoleLevel(OnBase 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> base, String groupID, int offset, int count, long joinTimeBegin, long joinTimeEnd, List 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 base, String groupID, int needVerification) { + Open_im_sdk.setGroupVerification(BaseImpl.stringBase(base), ParamsUtil.buildOperationID(), groupID, needVerification); + } } diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/WorkMomentsManager.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/WorkMomentsManager.java index 5646112..05befc5 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/WorkMomentsManager.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/WorkMomentsManager.java @@ -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) { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtUserInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtUserInfo.java index 3dfcc51..0df6dda 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtUserInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AtUserInfo.java @@ -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() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AttachedInfoElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AttachedInfoElem.java index 146b512..b209736 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AttachedInfoElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/AttachedInfoElem.java @@ -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() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/BlacklistInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/BlacklistInfo.java index 8770f0b..593fbb6 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/BlacklistInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/BlacklistInfo.java @@ -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; diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationInfo.java index 79814b5..dc90ea7 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationInfo.java @@ -27,7 +27,7 @@ public class ConversationInfo { private String faceURL; /** * 接收消息选项：
- * 0:在线正常接收消息，离线时进行推送
+ * 0:在线正常接收消息，离线时进行推送
* 1:不会接收到消息
* 2:在线正常接收消息，离线不会有推送 */ @@ -37,7 +37,7 @@ public class ConversationInfo { */ private int unreadCount; /** - * + * 强提示 如at消息，公告 {@link io.openim.android.sdk.enums.GroupAtType} */ private int groupAtType; /** @@ -45,7 +45,7 @@ public class ConversationInfo { */ private String latestMsg; /** - * 最后一条消息发送时间(ns) + * 最后一条消息发送时间(ms) */ private long latestMsgSendTime; /** @@ -69,6 +69,9 @@ public class ConversationInfo { */ private String ext; + /** + * 是否还在群里 + * */ private boolean isNotInGroup; diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptInfo.java index 6a680fe..aaae358 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptInfo.java @@ -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() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptMemberInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptMemberInfo.java index d76bd07..d0c366b 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptMemberInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/DeptMemberInfo.java @@ -1,22 +1,76 @@ package io.openim.android.sdk.models; +/** + * 部门成员 + */ public class DeptMemberInfo { + /** + * 成员id + */ private String userID; + /** + * 昵称 + */ private String nickname; + /** + * 英文名 + */ private String englishName; + /** + * 头像 + */ private String faceURL; + /** + * 性别 + */ private int gender; + /** + * 移动电话 + */ private String mobile; + /** + * 座机 + */ private String telephone; + /** + * 出生日期 + */ private long birth; + /** + * 邮箱 + */ private String email; + /** + * 部门id + */ private String departmentID; + /** + * 排序 + */ private int order; + /** + * 职位 + */ private String position; + /** + * 领导 + */ private int leader; + /** + * 状态 + */ private int status; + /** + * 创建时间 + */ private long createTime; + /** + * 附加字段 + */ private String ex; + /** + * 附加信息 + */ private String attachedInfo; public String getUserID() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FaceElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FaceElem.java index 53e6008..fca9420 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FaceElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FaceElem.java @@ -1,7 +1,16 @@ package io.openim.android.sdk.models; +/** + * 表情 + */ public class FaceElem { + /** + * app内嵌表情包，根据index 匹配显示表情图 + * */ private int index; + /** + * 其他表情，如url表情，直接加载url即可 + * */ private String data; public int getIndex() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FileElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FileElem.java index f8d0758..c4fbaad 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FileElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FileElem.java @@ -6,7 +6,7 @@ public class FileElem { */ private String filePath; /** - * + * id */ private String uuid; /** diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendApplicationInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendApplicationInfo.java index 6dfdf57..848a633 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendApplicationInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendApplicationInfo.java @@ -1,20 +1,65 @@ package io.openim.android.sdk.models; public class FriendApplicationInfo { + /** + * 请求用户id + */ private String fromUserID; + /** + * 请求用户昵称 + */ private String fromNickname; + /** + * 请求用户头像 + */ private String fromFaceURL; + /** + * 请求用户性别 + */ private int fromGender; + /** + * 接受用户id + */ private String toUserID; + /** + * 接受用户昵称 + */ private String toNickname; + /** + * 接受用户头像 + */ private String toFaceURL; + /** + * 接受用户性别 + */ private int toGender; + /** + * 处理结果 0 等待处理，1 已同意， 2 已拒绝 + */ private int handleResult; + /** + * 请求备注 + */ private String reqMsg; + /** + * 创建时间 + */ private long createTime; + /** + * 处理者id + */ private String handlerUserID; + /** + * 处理备注 + */ private String handleMsg; + /** + * 处理时间 + */ private long handleTime; + /** + * 扩展字段 + */ private String ex; public String getFromUserID() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendInfo.java index cb5829a..d7dbc22 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendInfo.java @@ -1,18 +1,57 @@ package io.openim.android.sdk.models; +/** + * 好友信息 + */ public class FriendInfo { - String userID; - String nickname; - String faceURL; - int gender; - String phoneNumber; - long birth; - String email; - String remark; - String ex; - long createTime; - int addSource; - String operatorUserID; + /** + * 好友id + */ + private String userID; + /** + * 好友昵称 + */ + private String nickname; + /** + * 好友头像 + */ + private String faceURL; + /** + * 性别 + */ + private int gender; + /** + * 手机号 + */ + private String phoneNumber; + /** + * 出生日期 + */ + private long birth; + /** + * 邮箱 + */ + private String email; + /** + * 好友备注名 + */ + private String remark; + /** + * 扩展字段 + */ + private String ex; + /** + * 创建时间 + */ + private long createTime; + /** + * 添加方式 + */ + private int addSource; + /** + * 操作者id + */ + private String operatorUserID; public String getUserID() { return userID; diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendshipInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendshipInfo.java index 8246334..20ed0da 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendshipInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/FriendshipInfo.java @@ -1,10 +1,13 @@ package io.openim.android.sdk.models; public class FriendshipInfo { + /** + * 用户id + */ private String userID; - - /// 1 means friend (and not blacklist) - /// 1表示好友（并且不是黑名单） + /** + * 1表示好友（并且不是黑名单） + */ private int result; public String getUserID() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupApplicationInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupApplicationInfo.java index 39febf7..dc78e35 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupApplicationInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupApplicationInfo.java @@ -1,32 +1,94 @@ package io.openim.android.sdk.models; public class GroupApplicationInfo { + /** + * 群id + */ private String groupID; + /** + * 群名 + */ private String groupName; + /** + * 群公告 + */ private String notification; + /** + * 群简介 + */ private String introduction; + /** + * 群头像 + */ private String groupFaceURL; + /** + * 创建时间 + */ private long createTime; + /** + * 状态 + */ private int status; + /** + * 创建者id + */ private String creatorUserID; + /** + * 群类型 + */ private int groupType; + /** + * 拥有者id + */ private String ownerUserID; + /** + * 成员数量 + */ private int memberCount; + /** + * 申请者的id + */ private String userID; + /** + * 申请者的昵称 + */ private String nickname; + /** + * 申请者的头像 + */ private String userFaceURL; + /** + * 申请者的性别 + */ private int gender; - /** * REFUSE = -1, AGREE = 1 * -1：拒绝，1：同意 */ private int handleResult; + /** + * 申请原因 + */ private String reqMsg; + /** + * 处理结果描述 + */ private String handledMsg; + /** + * 申请时间 + */ private long reqTime; + /** + * 处理者的id + */ private String handleUserID; + /** + * 处理时间 + */ private long handledTime; + /** + * 扩展字段 + */ private String ex; public String getGroupID() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupHasReadInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupHasReadInfo.java index 09995d8..fe5cba8 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupHasReadInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupHasReadInfo.java @@ -3,8 +3,18 @@ import java.util.List; public class GroupHasReadInfo { + /** + * 已读的用户id列表 + */ private List hasReadUserIDList; + /** + * 已读总数 + */ private int hasReadCount; + /** + * 发送此条消息时的群人数 + */ + private int groupMemberCount; public List getHasReadUserIDList() { return hasReadUserIDList; @@ -21,4 +31,12 @@ public int getHasReadCount() { public void setHasReadCount(int hasReadCount) { this.hasReadCount = hasReadCount; } + + public int getGroupMemberCount() { + return groupMemberCount; + } + + public void setGroupMemberCount(int groupMemberCount) { + this.groupMemberCount = groupMemberCount; + } } diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupInfo.java index 656ab75..d25aeb6 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupInfo.java @@ -34,12 +34,25 @@ public class GroupInfo { */ private int memberCount; /** - * ok = 0 blocked = 1 Dismissed = 2 Muted = 3 + * 群状态： ok = 0 blocked = 1 Dismissed = 2 Muted = 3 */ private int status; + /** + * 创建者id + */ private String creatorUserID; + /** + * 群类型 + */ private int groupType; + /** + * 扩展字段 + */ private String ex; + /** + * 进群验证方式 {@link io.openim.android.sdk.enums.GroupVerification} + */ + private int needVerification; public String getGroupID() { return groupID; @@ -136,4 +149,12 @@ public String getEx() { public void setEx(String ex) { this.ex = ex; } + + public int getNeedVerification() { + return needVerification; + } + + public void setNeedVerification(int needVerification) { + this.needVerification = needVerification; + } } diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMemberRole.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMemberRole.java index 66b323a..dac97bc 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMemberRole.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMemberRole.java @@ -1,9 +1,13 @@ package io.openim.android.sdk.models; public class GroupMemberRole { + /** + * 成员id + */ private String userID; - /// 1 ordinary member, 2 group owners, 3 administrators - /// 1普通成员, 2群主，3管理员 + /** + * 1普通成员, 2群主，3管理员 {@link io.openim.android.sdk.enums.GroupRole} + */ private int roleLevel; public String getUserID() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMembersInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMembersInfo.java index d76c3f1..584e6a5 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMembersInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GroupMembersInfo.java @@ -25,10 +25,18 @@ public class GroupMembersInfo { * 入群时间 */ private long joinTime; - + /** + * 加入方式 + */ private int joinSource; + /** + * 操作者id + */ private String operatorUserID; - private String ext; + /** + * 扩展字段 + */ + private String ex; /** * 禁言结束时间 */ @@ -90,12 +98,12 @@ public void setOperatorUserID(String operatorUserID) { this.operatorUserID = operatorUserID; } - public String getExt() { - return ext; + public String getEx() { + return ex; } - public void setExt(String ext) { - this.ext = ext; + public void setEx(String ex) { + this.ex = ex; } public String getNickname() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/LocationElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/LocationElem.java index 64b7471..b866c5e 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/LocationElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/LocationElem.java @@ -1,8 +1,17 @@ package io.openim.android.sdk.models; public class LocationElem { + /** + * 位置描述 + */ private String description; + /** + * 经度 + */ private double longitude; + /** + * 纬度 + */ private double latitude; public String getDescription() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/MergeElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/MergeElem.java index 2c2c6de..ac552ee 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/MergeElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/MergeElem.java @@ -3,8 +3,17 @@ import java.util.List; public class MergeElem { + /** + * 标题 + */ private String title; + /** + * 摘要 + */ private List abstractList; + /** + * 具体选择合并的消息列表 + */ private List multiMessage; public String getTitle() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/Message.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/Message.java index db99a8f..da31975 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/Message.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/Message.java @@ -14,11 +14,11 @@ public class Message { */ private long createTime; /** - * 消息发送时间，单位纳秒 + * 消息发送时间，单位ms */ private long sendTime; /** - * 会话类型 1:单聊 2:群聊 + * 会话类型 1:单聊 2:群聊 {@link io.openim.android.sdk.enums.ConversationType} */ private int sessionType; /** @@ -34,6 +34,7 @@ public class Message { */ private int msgFrom; /** + * {@link io.openim.android.sdk.enums.MessageType} * 消息类型：
* 101:文本消息
* 102:图片消息
@@ -51,6 +52,7 @@ public class Message { */ private int contentType; /** + * {@link io.openim.android.sdk.enums.Platform} * 平台类型 1:ios 2:android 3:windows 4:osx 5:web 6:mini 7:linux */ private int platformID; @@ -79,6 +81,7 @@ public class Message { */ private boolean isRead; /** + * {@link io.openim.android.sdk.enums.MessageStatus} * 消息状态 1:发送中 2:发送成功 3:发送失败 4:已删除 5:已撤回 */ private int status; @@ -94,6 +97,9 @@ public class Message { * */ private Object ext; + /** + * 附加字段 + */ private Object ex; /** * 图片信息 diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotDisturbInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotDisturbInfo.java index d52d7b0..29d4463 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotDisturbInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotDisturbInfo.java @@ -1,12 +1,12 @@ package io.openim.android.sdk.models; + public class NotDisturbInfo { - // {"conversationId":"single_13922222222","result":0} - /* + /** * 会话id * */ private String conversationId; - /* + /** * 免打扰状态 * 1:屏蔽消息; 2:接收消息但不提示; 0:正常 * */ diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotificationElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotificationElem.java index 9453764..f189590 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotificationElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/NotificationElem.java @@ -1,7 +1,13 @@ package io.openim.android.sdk.models; public class NotificationElem { + /** + * 通知内容详情 + */ private String detail; + /** + * 默认提示内容 + */ private String defaultTips; public String getDetail() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/PublicUserInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/PublicUserInfo.java index beef7b5..fc17473 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/PublicUserInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/PublicUserInfo.java @@ -1,11 +1,29 @@ package io.openim.android.sdk.models; public class PublicUserInfo { + /** + * 用户id + */ private String userID; + /** + * 昵称 + */ private String nickname; + /** + * 头像 + */ private String faceURL; + /** + * 性别 + */ private int gender; + /** + * + */ private int appMangerLevel; + /** + * 扩展字段 + */ private String ex; public String getUserID() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/QuoteElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/QuoteElem.java index 5857ef3..7b495d1 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/QuoteElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/QuoteElem.java @@ -1,7 +1,13 @@ package io.openim.android.sdk.models; public class QuoteElem { + /** + * 回复内容 + */ private String text; + /** + * 被回复的消息 + */ private Message quoteMessage; public String getText() { diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ReadReceiptInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ReadReceiptInfo.java index 63ca6d2..fb41479 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ReadReceiptInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ReadReceiptInfo.java @@ -24,6 +24,7 @@ public class ReadReceiptInfo { */ private int msgFrom; /** + * {@link io.openim.android.sdk.enums.MessageType} * 消息类型： * 101:文本消息 * 102:图片消息 @@ -41,6 +42,7 @@ public class ReadReceiptInfo { */ private int contentType; /** + * {@link io.openim.android.sdk.enums.ConversationType} * 会话类型 1:单聊 2:群聊 */ private int sessionType; diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SignalingInvitationInfo.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SignalingInvitationInfo.java index 7867de8..3ab02bb 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SignalingInvitationInfo.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SignalingInvitationInfo.java @@ -3,15 +3,42 @@ import java.util.List; public class SignalingInvitationInfo { - private String inviterUserID; //邀请者UserID - private List inviteeUserIDList; //被邀请者UserID列表，如果是单聊只有一个元素 - private String groupID; //如果是单聊，为"" - private String roomID; //房间ID，必须唯一，可以不设置。 - private long timeout; //邀请超时时间（秒） - private long initiateTime; //邀请超时时间（秒） - private String mediaType; //video 或者audio - private int sessionType; //1为单聊，2为群聊 - private int platformID; //和之前定义一致 + /** + * 邀请者UserID + */ + private String inviterUserID; + /** + * 被邀请者UserID列表，如果是单聊只有一个元素 + */ + private List inviteeUserIDList; + /** + * 如果是单聊，为"" + */ + private String groupID; + /** + * 房间ID，必须唯一，可以不设置。 + */ + private String roomID; + /** + * 邀请超时时间（秒） + */ + private long timeout; + /** + * 发起时间（秒） + */ + private long initiateTime; + /** + * video 或者audio + */ + private String mediaType; + /** + * 1为单聊，2为群聊 + */ + private int sessionType; + /** + * 和之前定义一致 + */ + private int platformID; public String getInviterUserID() { return inviterUserID; diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SoundElem.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SoundElem.java index 5e70b8b..4f0cd11 100644 --- a/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SoundElem.java +++ b/OpenIM-SDK/src/main/java/io/openim/android/sdk/models/SoundElem.java @@ -18,7 +18,7 @@ public class SoundElem { */ private long dataSize; /** - * 音频时长 + * 音频时长 s */ private long duration; diff --git a/README.md b/README.md index 6361374..a3d4b59 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,9 @@ maven { ##### 2，Add dependencies（添加依赖） ``` - implementation 'io.openim:android-sdk:2.0.9.2@aar' - implementation 'io.openim:core-sdk:2.0.9.23@aar' + implementation 'io.openim:android-sdk:2.1.0.1@aar' + implementation 'io.openim:core-sdk:2.1.0.2@aar' + implementation 'com.google.code.gson:gson:2.9.0' ``` #### Proguard rules（混淆规则）