Skip to content

Commit cdb7f44

Browse files
skill20skill20
authored
Merge pull request #137 from skill20/master
添加视频接口sendVideoMessage
2 parents d8f14c6 + 2b02ef6 commit cdb7f44

File tree

2 files changed

+262
-187
lines changed

2 files changed

+262
-187
lines changed

‎android/src/main/java/com/jiguang/jmessageflutter/JsonUtils.java‎

Lines changed: 103 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import cn.jpush.im.android.api.content.LocationContent;
2828
import cn.jpush.im.android.api.content.MessageContent;
2929
import cn.jpush.im.android.api.content.TextContent;
30+
import cn.jpush.im.android.api.content.VideoContent;
3031
import cn.jpush.im.android.api.content.VoiceContent;
3132
import cn.jpush.im.android.api.enums.ConversationType;
3233
import cn.jpush.im.android.api.enums.MessageDirect;
@@ -96,7 +97,7 @@ static HashMap toJson(final UserInfo userInfo) {
9697

9798
result.put("username", userInfo.getUserName() != null ? userInfo.getUserName() : "");
9899
result.put("appKey", userInfo.getAppKey());
99-
result.put("nickname", userInfo.getNickname() != null ? userInfo.getNickname(): "");
100+
result.put("nickname", userInfo.getNickname() != null ? userInfo.getNickname() : "");
100101
if (userInfo.getAvatarFile() != null) {
101102
result.put("avatarThumbPath", userInfo.getAvatarFile().getAbsolutePath());
102103
} else {
@@ -116,7 +117,7 @@ static HashMap toJson(final UserInfo userInfo) {
116117
result.put("birthday", "");
117118
}
118119

119-
result.put("region", userInfo.getRegion() != null ? userInfo.getRegion() :"");
120+
result.put("region", userInfo.getRegion() != null ? userInfo.getRegion() : "");
120121
result.put("signature", userInfo.getSignature() != null ? userInfo.getSignature() : "");
121122
result.put("address", userInfo.getAddress() != null ? userInfo.getAddress() : "");
122123
result.put("noteName", userInfo.getNotename() != null ? userInfo.getNotename() : "");
@@ -137,7 +138,8 @@ static HashMap toJson(GroupInfo groupInfo) {
137138
result.put("id", String.valueOf(groupInfo.getGroupID()));
138139

139140
switch (groupInfo.getGroupType()) {
140-
case public_group: {}
141+
case public_group: {
142+
}
141143
result.put("groupType", "public");
142144
break;
143145
default:
@@ -193,9 +195,10 @@ static HashMap toJson(GroupBasicInfo groupInfo) {
193195
result.put("avatarThumbPath", groupInfo.getAvatar());
194196
result.put("maxMemberCount", groupInfo.getMaxMemberCount());//String.valueOf(groupInfo.getMaxMemberCount())
195197
switch (groupInfo.getGroupType()) {
196-
case public_group: {}
197-
result.put("groupType", "public");
198-
break;
198+
case public_group: {
199+
}
200+
result.put("groupType", "public");
201+
break;
199202
default:
200203
result.put("groupType", "private");
201204
break;
@@ -217,20 +220,20 @@ static HashMap toJson(Message msg) {
217220

218221
HashMap targetJson = null;
219222
switch (msg.getTargetType()) {
220-
case single:
221-
if (isSend) { // 消息发送
222-
targetJson = toJson((UserInfo) msg.getTargetInfo());
223-
} else { // 消息接收
224-
targetJson = toJson(JMessageClient.getMyInfo());
225-
}
226-
break;
227-
case group:
228-
targetJson = toJson((GroupInfo) msg.getTargetInfo());
229-
break;
230-
case chatroom:
231-
targetJson = toJson((ChatRoomInfo) msg.getTargetInfo());
232-
break;
233-
default:
223+
case single:
224+
if (isSend) { // 消息发送
225+
targetJson = toJson((UserInfo) msg.getTargetInfo());
226+
} else { // 消息接收
227+
targetJson = toJson(JMessageClient.getMyInfo());
228+
}
229+
break;
230+
case group:
231+
targetJson = toJson((GroupInfo) msg.getTargetInfo());
232+
break;
233+
case chatroom:
234+
targetJson = toJson((ChatRoomInfo) msg.getTargetInfo());
235+
break;
236+
default:
234237
}
235238
result.put("target", targetJson);
236239
switch (msg.getStatus()) {
@@ -269,84 +272,92 @@ static HashMap toJson(Message msg) {
269272
result.put("createTime", msg.getCreateTime());
270273

271274
switch (msg.getContentType()) {
272-
case text:
273-
result.put("type", "text");
274-
result.put("text", ((TextContent) content).getText());
275-
break;
276-
case image:
277-
result.put("type", "image");
278-
result.put("thumbPath", ((ImageContent) content).getLocalThumbnailPath());
279-
break;
280-
case voice:
281-
result.put("type", "voice");
282-
result.put("path", ((VoiceContent) content).getLocalPath());
283-
result.put("duration", ((VoiceContent) content).getDuration() + 0.0);
284-
break;
285-
case file:
286-
result.put("type", "file");
287-
result.put("fileName", ((FileContent) content).getFileName());
288-
break;
289-
case custom:
290-
result.put("type", "custom");
291-
Map<String, String> customObject = ((CustomContent) content).getAllStringValues();
292-
result.put("customObject", toJson(customObject));
293-
break;
294-
case location:
295-
result.put("type", "location");
296-
result.put("latitude", ((LocationContent) content).getLatitude().doubleValue());
297-
result.put("longitude", ((LocationContent) content).getLongitude().doubleValue());
298-
result.put("address", ((LocationContent) content).getAddress());
299-
result.put("scale", ((LocationContent) content).getScale().intValue());
300-
break;
301-
case eventNotification:
302-
result.put("type", "event");
303-
List usernameList = ((EventNotificationContent) content).getUserNames();
304-
if (usernameList != null) {
305-
result.put("usernames", toJson(usernameList));
306-
}
307-
switch (((EventNotificationContent) content).getEventNotificationType()) {
308-
case group_member_added:
309-
// 群成员加群事件
310-
result.put("eventType", "group_member_added");
275+
case text:
276+
result.put("type", "text");
277+
result.put("text", ((TextContent) content).getText());
311278
break;
312-
case group_member_removed:
313-
// 群成员被踢事件
314-
result.put("eventType", "group_member_removed");
279+
case image:
280+
result.put("type", "image");
281+
result.put("thumbPath", ((ImageContent) content).getLocalThumbnailPath());
315282
break;
316-
case group_member_exit:
317-
// 群成员退群事件
318-
result.put("eventType", "group_member_exit");
283+
case voice:
284+
result.put("type", "voice");
285+
result.put("path", ((VoiceContent) content).getLocalPath());
286+
result.put("duration", ((VoiceContent) content).getDuration() + 0.0);
319287
break;
320-
case group_info_updated:
321-
result.put("eventType", "group_info_updated");
288+
case file:
289+
result.put("type", "file");
290+
result.put("fileName", ((FileContent) content).getFileName());
322291
break;
323-
case group_member_keep_silence:
324-
result.put("eventType", "group_member_keep_silence");
292+
case custom:
293+
result.put("type", "custom");
294+
Map<String, String> customObject = ((CustomContent) content).getAllStringValues();
295+
result.put("customObject", toJson(customObject));
325296
break;
326-
case group_member_keep_silence_cancel:
327-
result.put("eventType", "group_member_keep_silence_cancel");
297+
case location:
298+
result.put("type", "location");
299+
result.put("latitude", ((LocationContent) content).getLatitude().doubleValue());
300+
result.put("longitude", ((LocationContent) content).getLongitude().doubleValue());
301+
result.put("address", ((LocationContent) content).getAddress());
302+
result.put("scale", ((LocationContent) content).getScale().intValue());
328303
break;
329-
case group_keeper_added:
330-
result.put("eventType", "group_keeper_added");
331-
break;
332-
case group_keeper_removed:
333-
result.put("eventType", "group_keeper_removed");
334-
break;
335-
case group_dissolved:
336-
// 解散群组事件
337-
result.put("eventType", "group_dissolved");
338-
break;
339-
case group_owner_changed:
340-
// 移交群组事件
341-
result.put("eventType", "group_owner_changed");
342-
break;
343-
case group_type_changed:
344-
// 移交群组事件
345-
result.put("eventType", "group_type_changed");
304+
case video:
305+
result.put("type", "video");
306+
result.put("duration", ((VideoContent) content).getDuration());
307+
result.put("videoPath", ((VideoContent) content).getVideoLocalPath());
308+
result.put("thumbImagePath", ((VideoContent) content).getThumbLocalPath());
309+
result.put("videoFileName", ((VideoContent) content).getFileName());
310+
result.put("thumbFormat", ((VideoContent) content).getThumbFormat());
346311
break;
312+
case eventNotification:
313+
result.put("type", "event");
314+
List usernameList = ((EventNotificationContent) content).getUserNames();
315+
if (usernameList != null) {
316+
result.put("usernames", toJson(usernameList));
317+
}
318+
switch (((EventNotificationContent) content).getEventNotificationType()) {
319+
case group_member_added:
320+
// 群成员加群事件
321+
result.put("eventType", "group_member_added");
322+
break;
323+
case group_member_removed:
324+
// 群成员被踢事件
325+
result.put("eventType", "group_member_removed");
326+
break;
327+
case group_member_exit:
328+
// 群成员退群事件
329+
result.put("eventType", "group_member_exit");
330+
break;
331+
case group_info_updated:
332+
result.put("eventType", "group_info_updated");
333+
break;
334+
case group_member_keep_silence:
335+
result.put("eventType", "group_member_keep_silence");
336+
break;
337+
case group_member_keep_silence_cancel:
338+
result.put("eventType", "group_member_keep_silence_cancel");
339+
break;
340+
case group_keeper_added:
341+
result.put("eventType", "group_keeper_added");
342+
break;
343+
case group_keeper_removed:
344+
result.put("eventType", "group_keeper_removed");
345+
break;
346+
case group_dissolved:
347+
// 解散群组事件
348+
result.put("eventType", "group_dissolved");
349+
break;
350+
case group_owner_changed:
351+
// 移交群组事件
352+
result.put("eventType", "group_owner_changed");
353+
break;
354+
case group_type_changed:
355+
// 移交群组事件
356+
result.put("eventType", "group_type_changed");
357+
break;
358+
default:
359+
}
347360
default:
348-
}
349-
default:
350361
}
351362
return result;
352363
}
@@ -412,7 +423,7 @@ static HashMap toJson(Conversation conversation) {
412423
json.put("conversationType", "group");
413424
json.put("target", toJson(targetInfo));
414425
} else if (conversation.getType() == ConversationType.chatroom) {
415-
ChatRoomInfo chatRoom =(ChatRoomInfo) conversation.getTargetInfo();
426+
ChatRoomInfo chatRoom = (ChatRoomInfo) conversation.getTargetInfo();
416427
json.put("target", toJson(chatRoom));
417428
json.put("conversationType", "chatRoom");
418429
}
@@ -430,7 +441,7 @@ static HashMap toJson(Conversation conversation) {
430441
json.put("extras", new HashMap());
431442
}
432443

433-
Log.d("flutter plugin","native the conversation:" + json.toString());
444+
Log.d("flutter plugin", "native the conversation:" + json.toString());
434445

435446
return json;
436447
}

0 commit comments

Comments
 (0)