Skip to content

Commit 6a446a7

Browse files
author
Brett
committed
1 parent 9f57971 commit 6a446a7

39 files changed

+773
-999
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.8.1
2+
3+
- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1)
4+
15
## 3.8.1-rc.0
26

37
- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.1-rc.0)
@@ -9,7 +13,7 @@
913
## 3.8.0-rc.16
1014

1115
- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.8.0-rc.16)
12-
16+
1317
## 3.5.1
1418

1519
- [Bug fixes and performance enhancements.](https://github.com/openimsdk/openim-sdk-core/releases/tag/v3.5.1)

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ android {
5252
dependencies {
5353
// 本地依赖，现将aar复制到libs/io/openim/core-sdk/0.0.1/ 下，命名core-sdk-0.0.1.aar
5454
// implementation 'io.openim:core-sdk:0.0.1@aar'
55-
implementation 'io.openim:core-sdk:3.8.1-rc.0@aar'
55+
implementation 'io.openim:core-sdk:3.8.1@aar'
5656
}

‎android/src/main/java/io/openim/flutter_openim_sdk/listener/OnAdvancedMsgListener.java

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,6 @@ public void onRecvC2CReadReceipt(String s) {
3737
CommonUtil.emitEvent("advancedMsgListener", "onRecvC2CReadReceipt", values);
3838
}
3939

40-
@Override
41-
public void onRecvGroupReadReceipt(String s) {
42-
final Map<String, String> values = new ArrayMap<>();
43-
values.put("id", id);
44-
values.put("groupMsgReceiptList", s);
45-
CommonUtil.emitEvent("advancedMsgListener", "onRecvGroupReadReceipt", values);
46-
}
47-
48-
49-
@Override
50-
public void onRecvMessageExtensionsAdded(String s, String s1) {
51-
final Map<String, String> values = new ArrayMap<>();
52-
values.put("id", id);
53-
values.put("msgID", s);
54-
values.put("reactionExtensionList", s1);
55-
CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageExtensionsAdded", values);
56-
}
57-
58-
@Override
59-
public void onRecvMessageExtensionsChanged(String s, String s1) {
60-
final Map<String, String> values = new ArrayMap<>();
61-
values.put("id", id);
62-
values.put("msgID", s);
63-
values.put("reactionExtensionList", s1);
64-
CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageExtensionsChanged", values);
65-
}
66-
67-
@Override
68-
public void onRecvMessageExtensionsDeleted(String s, String s1) {
69-
final Map<String, String> values = new ArrayMap<>();
70-
values.put("id", id);
71-
values.put("msgID", s);
72-
values.put("reactionExtensionKeyList", s1);
73-
CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageExtensionsDeleted", values);
74-
}
75-
7640
@Override
7741
public void onRecvNewMessage(String s) {
7842
final Map<String, String> values = new ArrayMap<>();

‎android/src/main/java/io/openim/flutter_openim_sdk/listener/OnBaseListener.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ public OnBaseListener(MethodChannel.Result result, MethodCall call) {
1919

2020
@Override
2121
public void onError(int l, String s) {
22-
Log.i("F-OpenIMSDK(native call flutter)", "method: 【 " + call.method + " 】, onError: { code:" + l + ", message:" + s + "}");
22+
String threadName = Thread.currentThread().getName();
23+
Log.i("F-OpenIMSDK(native call flutter)", "thread: " + threadName + " method: 【 " + call.method + " 】, onError: { code:" + l + ", message:" + s + "}");
2324
CommonUtil.runMainThreadReturnError(result, l, s, null);
2425
}
2526

2627
@Override
2728
public void onSuccess(String s) {
28-
Log.i("F-OpenIMSDK(native call flutter)", "method: 【 " + call.method + " 】, onSuccess: " + s);
29+
String threadName = Thread.currentThread().getName();
30+
Log.i("F-OpenIMSDK(native call flutter)", "thread: " + threadName + " method: 【 " + call.method + " 】, onSuccess: " + s);
2931
CommonUtil.runMainThreadReturn(result, s);
3032
}
3133
}

‎android/src/main/java/io/openim/flutter_openim_sdk/listener/OnListenerForService.java

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -24,66 +24,6 @@
2424
// }
2525
//
2626
// @Override
27-
// public void onHangUp(String s) {
28-
//
29-
// }
30-
//
31-
// @Override
32-
// public void onInvitationCancelled(String s) {
33-
//
34-
// }
35-
//
36-
// @Override
37-
// public void onInvitationTimeout(String s) {
38-
//
39-
// }
40-
//
41-
// @Override
42-
// public void onInviteeAccepted(String s) {
43-
//
44-
// }
45-
//
46-
// @Override
47-
// public void onInviteeAcceptedByOtherDevice(String s) {
48-
//
49-
// }
50-
//
51-
// @Override
52-
// public void onInviteeRejected(String s) {
53-
//
54-
// }
55-
//
56-
// @Override
57-
// public void onInviteeRejectedByOtherDevice(String s) {
58-
//
59-
// }
60-
//
61-
// @Override
62-
// public void onReceiveCustomSignal(String s) {
63-
//
64-
// }
65-
//
66-
// @Override
67-
// public void onReceiveNewInvitation(String s) {
68-
//
69-
// }
70-
//
71-
// @Override
72-
// public void onRoomParticipantConnected(String s) {
73-
//
74-
// }
75-
//
76-
// @Override
77-
// public void onRoomParticipantDisconnected(String s) {
78-
//
79-
// }
80-
//
81-
// @Override
82-
// public void onStreamChange(String s) {
83-
//
84-
// }
85-
//
86-
// @Override
8727
// public void onRecvNewMessage(String s) {
8828
// CommonUtil.emitEvent("listenerForService", "onRecvNewMessage", s);
8929
// }

‎android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java

Lines changed: 18 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ public void setConversationDraft(MethodCall methodCall, MethodChannel.Result res
5959
);
6060
}
6161

62-
public void pinConversation(MethodCall methodCall, MethodChannel.Result result) {
63-
Open_im_sdk.pinConversation(
64-
new OnBaseListener(result, methodCall),
65-
value(methodCall, "operationID"),
66-
value(methodCall, "conversationID"),
67-
value(methodCall, "isPinned")
68-
);
69-
}
70-
7162
public void hideConversation(MethodCall methodCall, MethodChannel.Result result) {
7263
Open_im_sdk.hideConversation(
7364
new OnBaseListener(result, methodCall),
@@ -98,32 +89,6 @@ public void getConversationIDBySessionType(MethodCall methodCall, MethodChannel.
9889
int2long(methodCall, "sessionType")));
9990
}
10091

101-
public void setConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) {
102-
Open_im_sdk.setConversationRecvMessageOpt(
103-
new OnBaseListener(result, methodCall),
104-
value(methodCall, "operationID"),
105-
value(methodCall, "conversationID"),
106-
int2long(methodCall, "status")
107-
);
108-
}
109-
110-
public void getConversationRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) {
111-
Open_im_sdk.getConversationRecvMessageOpt(
112-
new OnBaseListener(result, methodCall),
113-
value(methodCall, "operationID"),
114-
jsonValue(methodCall, "conversationIDList")
115-
);
116-
}
117-
118-
public void setConversationPrivateChat(MethodCall methodCall, MethodChannel.Result result) {
119-
Open_im_sdk.setConversationPrivateChat(
120-
new OnBaseListener(result, methodCall),
121-
value(methodCall, "operationID"),
122-
value(methodCall, "conversationID"),
123-
value(methodCall, "isPrivate")
124-
);
125-
}
126-
12792
public void clearConversationAndDeleteAllMsg(MethodCall methodCall, MethodChannel.Result result) {
12893
Open_im_sdk.clearConversationAndDeleteAllMsg(
12994
new OnBaseListener(result, methodCall),
@@ -140,56 +105,10 @@ public void deleteConversationAndDeleteAllMsg(MethodCall methodCall, MethodChann
140105
);
141106
}
142107

143-
public void deleteAllConversationFromLocal(MethodCall methodCall, MethodChannel.Result result) {
144-
}
145-
146-
public void resetConversationGroupAtType(MethodCall methodCall, MethodChannel.Result result) {
147-
Open_im_sdk.resetConversationGroupAtType(
148-
new OnBaseListener(result, methodCall),
149-
value(methodCall, "operationID"),
150-
value(methodCall, "conversationID")
151-
);
152-
}
153-
154108
public void getAtAllTag(MethodCall methodCall, MethodChannel.Result result) {
155109
CommonUtil.runMainThreadReturn(result, Open_im_sdk.getAtAllTag(value(methodCall, "operationID")));
156110
}
157111

158-
public void setGlobalRecvMessageOpt(MethodCall methodCall, MethodChannel.Result result) {
159-
Open_im_sdk.setGlobalRecvMessageOpt(
160-
new OnBaseListener(result, methodCall),
161-
value(methodCall, "operationID"),
162-
int2long(methodCall, "status")
163-
);
164-
}
165-
166-
public void setConversationBurnDuration(MethodCall methodCall, MethodChannel.Result result) {
167-
Open_im_sdk.setConversationBurnDuration(
168-
new OnBaseListener(result, methodCall),
169-
value(methodCall, "operationID"),
170-
value(methodCall, "conversationID"),
171-
value(methodCall, "burnDuration")
172-
);
173-
}
174-
175-
public void setConversationIsMsgDestruct(MethodCall methodCall, MethodChannel.Result result) {
176-
Open_im_sdk.setConversationIsMsgDestruct(
177-
new OnBaseListener(result, methodCall),
178-
value(methodCall, "operationID"),
179-
value(methodCall, "conversationID"),
180-
value(methodCall, "isMsgDestruct")
181-
);
182-
}
183-
184-
public void setConversationMsgDestructTime(MethodCall methodCall, MethodChannel.Result result) {
185-
Open_im_sdk.setConversationMsgDestructTime(
186-
new OnBaseListener(result, methodCall),
187-
value(methodCall, "operationID"),
188-
value(methodCall, "conversationID"),
189-
int2long(methodCall, "duration")
190-
);
191-
}
192-
193112
public void hideAllConversations(MethodCall methodCall, MethodChannel.Result result) {
194113
Open_im_sdk.hideAllConversations(
195114
new OnBaseListener(result, methodCall),
@@ -205,15 +124,6 @@ public void searchConversation(MethodCall methodCall, MethodChannel.Result resu
205124
);
206125
}
207126

208-
public void setConversationEx(MethodCall methodCall, MethodChannel.Result result) {
209-
Open_im_sdk.setConversationEx(
210-
new OnBaseListener(result, methodCall),
211-
value(methodCall, "operationID"),
212-
value(methodCall, "conversationID"),
213-
value(methodCall, "ex")
214-
);
215-
}
216-
217127
public void changeInputStates(MethodCall methodCall, MethodChannel.Result result) {
218128
Open_im_sdk.changeInputStates(
219129
new OnBaseListener(result, methodCall),
@@ -231,4 +141,22 @@ public void getInputStates(MethodCall methodCall, MethodChannel.Result result) {
231141
value(methodCall, "userID")
232142
);
233143
}
144+
145+
public void setConversation(MethodCall methodCall, MethodChannel.Result result) {
146+
Open_im_sdk.setConversation(
147+
new OnBaseListener(result, methodCall),
148+
value(methodCall, "operationID"),
149+
value(methodCall, "conversationID"),
150+
jsonValue(methodCall, "req")
151+
);
152+
}
153+
154+
155+
public void searchConversations(MethodCall methodCall, MethodChannel.Result result) {
156+
Open_im_sdk.searchConversation(
157+
new OnBaseListener(result, methodCall),
158+
value(methodCall, "operationID"),
159+
value(methodCall, "name")
160+
);
161+
}
234162
}

‎android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public void getFriendsInfo(MethodCall methodCall, MethodChannel.Result result) {
1919
Open_im_sdk.getSpecifiedFriendsInfo(
2020
new OnBaseListener(result, methodCall),
2121
value(methodCall, "operationID"),
22-
jsonValue(methodCall, "userIDList")
22+
jsonValue(methodCall, "userIDList"),
23+
value(methodCall, "filterBlack")
2324
);
2425
}
2526

@@ -48,7 +49,8 @@ public void getFriendApplicationListAsApplicant(MethodCall methodCall, MethodCha
4849
public void getFriendList(MethodCall methodCall, MethodChannel.Result result) {
4950
Open_im_sdk.getFriendList(
5051
new OnBaseListener(result, methodCall),
51-
value(methodCall, "operationID")
52+
value(methodCall, "operationID"),
53+
value(methodCall, "filterBlack")
5254
);
5355
}
5456

@@ -57,15 +59,8 @@ public void getFriendListPage(MethodCall methodCall, MethodChannel.Result result
5759
new OnBaseListener(result, methodCall),
5860
value(methodCall, "operationID"),
5961
value(methodCall, "offset"),
60-
value(methodCall, "count")
61-
);
62-
}
63-
64-
public void setFriendRemark(MethodCall methodCall, MethodChannel.Result result) {
65-
Open_im_sdk.setFriendRemark(
66-
new OnBaseListener(result, methodCall),
67-
value(methodCall, "operationID"),
68-
jsonValue(methodCall)
62+
value(methodCall, "count"),
63+
value(methodCall, "filterBlack")
6964
);
7065
}
7166

@@ -133,12 +128,11 @@ public void searchFriends(MethodCall methodCall, MethodChannel.Result result) {
133128
);
134129
}
135130

136-
public void setFriendsEx(MethodCall methodCall, MethodChannel.Result result) {
137-
Open_im_sdk.setFriendsEx(
131+
public void updateFriends(MethodCall methodCall, MethodChannel.Result result) {
132+
Open_im_sdk.updateFriends(
138133
new OnBaseListener(result, methodCall),
139134
value(methodCall, "operationID"),
140-
jsonValue(methodCall, "friendIDs"),
141-
value(methodCall, "ex")
135+
jsonValue(methodCall, "req")
142136
);
143137
}
144138
}

0 commit comments

Comments
 (0)