Skip to content

Commit 41129d2

Browse files
JauneQJauneQ
authored
Merge pull request #93 from JauneQ/main
update for core sdk v3.8.3-patch.10
2 parents ae2e527 + f63c8a0 commit 41129d2

File tree

8 files changed

+198
-6
lines changed

8 files changed

+198
-6
lines changed

‎OpenIM-SDK/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ dependencies {
5353
implementation 'androidx.annotation:annotation:1.6.0'
5454

5555
compileOnly 'com.google.code.gson:gson:2.9.1'
56-
implementation 'io.openim:core-sdk:3.8.3-patch3'
56+
implementation 'io.openim:core-sdk:3.8.3-patch10'
5757

5858
}

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/FriendshipManager.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import io.openim.android.sdk.models.FriendApplicationInfo;
1616
import io.openim.android.sdk.models.FriendInfo;
1717
import io.openim.android.sdk.models.FriendshipInfo;
18+
import io.openim.android.sdk.models.GetFriendApplicationListAsApplicantReq;
19+
import io.openim.android.sdk.models.GetFriendApplicationListAsRecipientReq;
1820
import io.openim.android.sdk.models.UpdateFriendsReq;
1921
import io.openim.android.sdk.models.UserInfo;
2022
import io.openim.android.sdk.utils.JsonUtil;
@@ -74,18 +76,37 @@ public void addFriend(OnBase<String> base, String uid, String reqMessage) {
7476
*
7577
* @param base callback List<{@link UserInfo}>
7678
*/
79+
@Deprecated
7780
public void getRecvFriendApplicationList(OnBase<List<FriendApplicationInfo>> base) {
78-
Open_im_sdk.getFriendApplicationListAsRecipient(BaseImpl.arrayBase(base, FriendApplicationInfo.class), ParamsUtil.buildOperationID());
81+
getRecvFriendApplicationList(base, new GetFriendApplicationListAsRecipientReq());
82+
}
83+
/**
84+
* 收到好友申请列表
85+
*
86+
* @param base callback List<{@link UserInfo}>
87+
*/
88+
public void getRecvFriendApplicationList(OnBase<List<FriendApplicationInfo>> base, GetFriendApplicationListAsRecipientReq recipientReq) {
89+
Open_im_sdk.getFriendApplicationListAsRecipient(BaseImpl.arrayBase(base, FriendApplicationInfo.class), ParamsUtil.buildOperationID(), JsonUtil.toString(recipientReq));
7990
}
8091

8192
/**
8293
* 发出好友申请列表
8394
*
8495
* @param base callback List<{@link UserInfo}>
8596
*/
97+
@Deprecated
8698
public void getSendFriendApplicationList(OnBase<List<FriendApplicationInfo>> base) {
87-
Open_im_sdk.getFriendApplicationListAsApplicant(BaseImpl.arrayBase(base, FriendApplicationInfo.class), ParamsUtil.buildOperationID());
99+
getSendFriendApplicationList(base, new GetFriendApplicationListAsApplicantReq());
88100
}
101+
/**
102+
* 发出好友申请列表
103+
*
104+
* @param base callback List<{@link UserInfo}>
105+
*/
106+
public void getSendFriendApplicationList(OnBase<List<FriendApplicationInfo>> base, GetFriendApplicationListAsApplicantReq applicantReq) {
107+
Open_im_sdk.getFriendApplicationListAsApplicant(BaseImpl.arrayBase(base, FriendApplicationInfo.class), ParamsUtil.buildOperationID(), JsonUtil.toString(applicantReq));
108+
}
109+
89110

90111
/**
91112
* 好友列表

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/manager/GroupManager.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import io.openim.android.sdk.listener.OnBase;
1313
import io.openim.android.sdk.listener.OnGroupListener;
1414
import io.openim.android.sdk.listener._GroupListener;
15+
import io.openim.android.sdk.models.GetGroupApplicationListAsApplicantReq;
16+
import io.openim.android.sdk.models.GetGroupApplicationListAsRecipientReq;
1517
import io.openim.android.sdk.models.GroupApplicationInfo;
1618
import io.openim.android.sdk.models.GroupInfo;
1719
import io.openim.android.sdk.models.GroupInfoReq;
@@ -197,17 +199,36 @@ public void transferGroupOwner(OnBase<String> base, String gid, String uid) {
197199
*
198200
* @param base callback {@link GroupApplicationInfo}
199201
*/
202+
@Deprecated
200203
public void getRecvGroupApplicationList(OnBase<List<GroupApplicationInfo>> base) {
201-
Open_im_sdk.getGroupApplicationListAsRecipient(BaseImpl.arrayBase(base, GroupApplicationInfo.class), ParamsUtil.buildOperationID());
204+
getRecvGroupApplicationList(base, new GetGroupApplicationListAsRecipientReq());
205+
}
206+
207+
/**
208+
* 收到群申请列表
209+
*
210+
* @param base callback {@link GroupApplicationInfo}
211+
*/
212+
public void getRecvGroupApplicationList(OnBase<List<GroupApplicationInfo>> base, GetGroupApplicationListAsRecipientReq recipientReq) {
213+
Open_im_sdk.getGroupApplicationListAsRecipient(BaseImpl.arrayBase(base, GroupApplicationInfo.class), ParamsUtil.buildOperationID(), JsonUtil.toString(recipientReq));
202214
}
203215

204216
/**
205217
* 发出群申请列表
206218
*
207219
* @param base callback {@link GroupApplicationInfo}
208220
*/
221+
@Deprecated
209222
public void getSendGroupApplicationList(OnBase<List<GroupApplicationInfo>> base) {
210-
Open_im_sdk.getGroupApplicationListAsApplicant(BaseImpl.arrayBase(base, GroupApplicationInfo.class), ParamsUtil.buildOperationID());
223+
getSendGroupApplicationList(base, new GetGroupApplicationListAsApplicantReq());
224+
}
225+
/**
226+
* 发出群申请列表
227+
*
228+
* @param base callback {@link GroupApplicationInfo}
229+
*/
230+
public void getSendGroupApplicationList(OnBase<List<GroupApplicationInfo>> base, GetGroupApplicationListAsApplicantReq applicantReq) {
231+
Open_im_sdk.getGroupApplicationListAsApplicant(BaseImpl.arrayBase(base, GroupApplicationInfo.class), ParamsUtil.buildOperationID(), JsonUtil.toString(applicantReq));
211232
}
212233

213234
/**

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/models/ConversationInfo.java‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package io.openim.android.sdk.models;
22

3+
import android.os.Parcel;
4+
import android.os.Parcelable;
5+
6+
import androidx.annotation.NonNull;
7+
38
import java.util.Objects;
49

5-
public class ConversationInfo {
10+
public class ConversationInfo implements Parcelable {
611
/**
712
* 会话id
813
*/
@@ -273,4 +278,70 @@ public boolean equals(Object o) {
273278
public int hashCode() {
274279
return Objects.hash(conversationID);
275280
}
281+
282+
protected ConversationInfo(Parcel in) {
283+
conversationID = in.readString();
284+
conversationType = in.readInt();
285+
userID = in.readString();
286+
groupID = in.readString();
287+
showName = in.readString();
288+
faceURL = in.readString();
289+
recvMsgOpt = in.readInt();
290+
unreadCount = in.readInt();
291+
groupAtType = in.readInt();
292+
latestMsg = in.readString();
293+
latestMsgSendTime = in.readLong();
294+
draftText = in.readString();
295+
draftTextTime = in.readLong();
296+
isPinned = in.readByte() != 0;
297+
isPrivateChat = in.readByte() != 0;
298+
ext = in.readString();
299+
ex = in.readString();
300+
isNotInGroup = in.readByte() != 0;
301+
burnDuration = in.readInt();
302+
msgDestructTime = in.readLong();
303+
isMsgDestruct = in.readByte() != 0;
304+
}
305+
306+
public static final Creator<ConversationInfo> CREATOR = new Creator<ConversationInfo>() {
307+
@Override
308+
public ConversationInfo createFromParcel(Parcel in) {
309+
return new ConversationInfo(in);
310+
}
311+
312+
@Override
313+
public ConversationInfo[] newArray(int size) {
314+
return new ConversationInfo[size];
315+
}
316+
};
317+
318+
@Override
319+
public int describeContents() {
320+
return 0;
321+
}
322+
323+
@Override
324+
public void writeToParcel(@NonNull Parcel dest, int flags) {
325+
dest.writeString(conversationID);
326+
dest.writeInt(conversationType);
327+
dest.writeString(userID);
328+
dest.writeString(groupID);
329+
dest.writeString(showName);
330+
dest.writeString(faceURL);
331+
dest.writeInt(recvMsgOpt);
332+
dest.writeInt(unreadCount);
333+
dest.writeInt(groupAtType);
334+
dest.writeString(latestMsg);
335+
dest.writeLong(latestMsgSendTime);
336+
dest.writeString(draftText);
337+
dest.writeLong(draftTextTime);
338+
dest.writeByte((byte) (isPinned ? 1 : 0));
339+
dest.writeByte((byte) (isPrivateChat ? 1 : 0));
340+
dest.writeString(ext);
341+
dest.writeString(ex);
342+
dest.writeByte((byte) (isNotInGroup ? 1 : 0));
343+
dest.writeInt(burnDuration);
344+
dest.writeLong(msgDestructTime);
345+
dest.writeByte((byte) (isMsgDestruct ? 1 : 0));
346+
}
276347
}

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GetFriendApplicationListAsApplicantReq.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package io.openim.android.sdk.models;
2+
3+
public class GetFriendApplicationListAsApplicantReq {
4+
private int offset;
5+
private int count;
6+
7+
public int getOffset() {
8+
return offset;
9+
}
10+
11+
public void setOffset(int offset) {
12+
this.offset = offset;
13+
}
14+
15+
public int getCount() {
16+
return count;
17+
}
18+
19+
public void setCount(int count) {
20+
this.count = count;
21+
}
22+
}

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GetFriendApplicationListAsRecipientReq.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.openim.android.sdk.models;
2+
3+
public class GetFriendApplicationListAsRecipientReq {
4+
private int[] handleResults;
5+
6+
public int[] getHandleResults() {
7+
return handleResults;
8+
}
9+
10+
public void setHandleResults(int[] handleResults) {
11+
this.handleResults = handleResults;
12+
}
13+
}

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GetGroupApplicationListAsApplicantReq.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package io.openim.android.sdk.models;
2+
3+
public class GetGroupApplicationListAsApplicantReq {
4+
private String[] groupIDs;
5+
private int[] handleResults;
6+
7+
public String[] getGroupIDs() {
8+
return groupIDs;
9+
}
10+
11+
public void setGroupIDs(String[] groupIDs) {
12+
this.groupIDs = groupIDs;
13+
}
14+
15+
public int[] getHandleResults() {
16+
return handleResults;
17+
}
18+
19+
public void setHandleResults(int[] handleResults) {
20+
this.handleResults = handleResults;
21+
}
22+
}

‎OpenIM-SDK/src/main/java/io/openim/android/sdk/models/GetGroupApplicationListAsRecipientReq.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package io.openim.android.sdk.models;
2+
3+
public class GetGroupApplicationListAsRecipientReq {
4+
private String[] groupIDs;
5+
private int[] handleResults;
6+
7+
public String[] getGroupIDs() {
8+
return groupIDs;
9+
}
10+
11+
public void setGroupIDs(String[] groupIDs) {
12+
this.groupIDs = groupIDs;
13+
}
14+
15+
public int[] getHandleResults() {
16+
return handleResults;
17+
}
18+
19+
public void setHandleResults(int[] handleResults) {
20+
this.handleResults = handleResults;
21+
}
22+
}

0 commit comments

Comments
 (0)