Skip to content

Flutter2 dev #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 22, 2022
Merged

Flutter2 dev #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aff2636
update
dujiepeng Apr 14, 2022
88072f5
fix messagea attribute error.
dujiepeng Apr 22, 2022
ae0d112
update
dujiepeng Apr 22, 2022
223c7af
update version
dujiepeng Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## NEXT

## 3.9.0+1
- 修复message.attribute不准；

## 3.9.0

- 增加单人推送免打扰接口；
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/easemob/im_flutter_sdk/EMChatManagerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ public void onConversationRead(String from, String to) {
}

private EMConversation.EMSearchDirection searchDirectionFromString(String direction) {
return direction == "up" ? EMConversation.EMSearchDirection.UP : EMConversation.EMSearchDirection.DOWN;
return direction.equals("up") ? EMConversation.EMSearchDirection.UP : EMConversation.EMSearchDirection.DOWN;
}

private EMConversation.EMConversationType typeFromInt(int intType) {
Expand Down
160 changes: 83 additions & 77 deletions android/src/main/java/com/easemob/im_flutter_sdk/EMHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,89 +323,95 @@ static EMMessage fromJson(JSONObject json) throws JSONException {
String type = bodyJson.getString("type");
if (json.getString("direction").equals("send")) {
switch (type) {
case "txt": {
message = EMMessage.createSendMessage(Type.TXT);
message.addBody(EMMessageBodyHelper.textBodyFromJson(bodyJson));
}
break;
case "img": {
message = EMMessage.createSendMessage(Type.IMAGE);
message.addBody(EMMessageBodyHelper.imageBodyFromJson(bodyJson));
}
break;
case "loc": {
message = EMMessage.createSendMessage(Type.LOCATION);
message.addBody(EMMessageBodyHelper.localBodyFromJson(bodyJson));
}
break;
case "video": {
message = EMMessage.createSendMessage(Type.VIDEO);
message.addBody(EMMessageBodyHelper.videoBodyFromJson(bodyJson));
}
break;
case "voice": {
message = EMMessage.createSendMessage(Type.VOICE);
message.addBody(EMMessageBodyHelper.voiceBodyFromJson(bodyJson));
}
break;
case "file": {
message = EMMessage.createSendMessage(Type.FILE);
message.addBody(EMMessageBodyHelper.fileBodyFromJson(bodyJson));
}
break;
case "cmd": {
message = EMMessage.createSendMessage(Type.CMD);
message.addBody(EMMessageBodyHelper.cmdBodyFromJson(bodyJson));
}
break;
case "custom": {
message = EMMessage.createSendMessage(Type.CUSTOM);
message.addBody(EMMessageBodyHelper.customBodyFromJson(bodyJson));
case "txt": {
message = EMMessage.createSendMessage(Type.TXT);
message.addBody(EMMessageBodyHelper.textBodyFromJson(bodyJson));
}
break;
case "img": {
message = EMMessage.createSendMessage(Type.IMAGE);
message.addBody(EMMessageBodyHelper.imageBodyFromJson(bodyJson));
}
break;
case "loc": {
message = EMMessage.createSendMessage(Type.LOCATION);
message.addBody(EMMessageBodyHelper.localBodyFromJson(bodyJson));
}
break;
case "video": {
message = EMMessage.createSendMessage(Type.VIDEO);
message.addBody(EMMessageBodyHelper.videoBodyFromJson(bodyJson));
}
break;
case "voice": {
message = EMMessage.createSendMessage(Type.VOICE);
message.addBody(EMMessageBodyHelper.voiceBodyFromJson(bodyJson));
}
break;
case "file": {
message = EMMessage.createSendMessage(Type.FILE);
message.addBody(EMMessageBodyHelper.fileBodyFromJson(bodyJson));
}
break;
case "cmd": {
message = EMMessage.createSendMessage(Type.CMD);
message.addBody(EMMessageBodyHelper.cmdBodyFromJson(bodyJson));
}
break;
case "custom": {
message = EMMessage.createSendMessage(Type.CUSTOM);
message.addBody(EMMessageBodyHelper.customBodyFromJson(bodyJson));
}
break;
}
break;
if (message != null) {
message.setDirection(EMMessage.Direct.SEND);
}
} else {
switch (type) {
case "txt": {
message = EMMessage.createReceiveMessage(Type.TXT);
message.addBody(EMMessageBodyHelper.textBodyFromJson(bodyJson));
}
break;
case "img": {
message = EMMessage.createReceiveMessage(Type.IMAGE);
message.addBody(EMMessageBodyHelper.imageBodyFromJson(bodyJson));
}
break;
case "loc": {
message = EMMessage.createReceiveMessage(Type.LOCATION);
message.addBody(EMMessageBodyHelper.localBodyFromJson(bodyJson));
}
break;
case "video": {
message = EMMessage.createReceiveMessage(Type.VIDEO);
message.addBody(EMMessageBodyHelper.videoBodyFromJson(bodyJson));
}
break;
case "voice": {
message = EMMessage.createReceiveMessage(Type.VOICE);
message.addBody(EMMessageBodyHelper.voiceBodyFromJson(bodyJson));
}
break;
case "file": {
message = EMMessage.createReceiveMessage(Type.FILE);
message.addBody(EMMessageBodyHelper.fileBodyFromJson(bodyJson));
}
break;
case "cmd": {
message = EMMessage.createReceiveMessage(Type.CMD);
message.addBody(EMMessageBodyHelper.cmdBodyFromJson(bodyJson));
}
case "txt": {
message = EMMessage.createReceiveMessage(Type.TXT);
message.addBody(EMMessageBodyHelper.textBodyFromJson(bodyJson));
}
break;
case "img": {
message = EMMessage.createReceiveMessage(Type.IMAGE);
message.addBody(EMMessageBodyHelper.imageBodyFromJson(bodyJson));
}
break;
case "loc": {
message = EMMessage.createReceiveMessage(Type.LOCATION);
message.addBody(EMMessageBodyHelper.localBodyFromJson(bodyJson));
}
break;
case "video": {
message = EMMessage.createReceiveMessage(Type.VIDEO);
message.addBody(EMMessageBodyHelper.videoBodyFromJson(bodyJson));
}
break;
case "voice": {
message = EMMessage.createReceiveMessage(Type.VOICE);
message.addBody(EMMessageBodyHelper.voiceBodyFromJson(bodyJson));
}
break;
case "file": {
message = EMMessage.createReceiveMessage(Type.FILE);
message.addBody(EMMessageBodyHelper.fileBodyFromJson(bodyJson));
}
break;
case "cmd": {
message = EMMessage.createReceiveMessage(Type.CMD);
message.addBody(EMMessageBodyHelper.cmdBodyFromJson(bodyJson));
}
break;
case "custom": {
message = EMMessage.createReceiveMessage(Type.CUSTOM);
message.addBody(EMMessageBodyHelper.customBodyFromJson(bodyJson));
}
break;
case "custom": {
message = EMMessage.createReceiveMessage(Type.CUSTOM);
message.addBody(EMMessageBodyHelper.customBodyFromJson(bodyJson));
}
break;
if (message != null) {
message.setDirection(EMMessage.Direct.RECEIVE);
}
}

Expand Down
24 changes: 20 additions & 4 deletions lib/src/tools/em_extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import '../models/em_group_shared_file.dart';
import 'dart:convert' as convert;

Type typeOf<T>() => T;

Expand Down Expand Up @@ -119,13 +120,28 @@ extension MapExtension on Map {
}

Map? getMapValue(String key, {Map? defaultValue}) {
Map? ret = defaultValue;
Map? ret = {};
if (this.containsKey(key)) {
Map? value = this[key];
if (value is double) {
ret = value;
Map tmpMap = this[key];
for (var tmpKey in tmpMap.keys) {
dynamic value = tmpMap[tmpKey];
if (value is String) {
do {
try {
dynamic data = convert.jsonDecode(value);
value = data;
break;
} on FormatException {}
} while (false);
ret[tmpKey] = value;
} else {
ret[tmpKey] = value;
}
}
}
if (ret.length == 0) {
ret = defaultValue;
}
return ret;
}
}
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: im_flutter_sdk
description: Easemob IM flutter SDK.
version: 3.9.0
version: 3.9.0+1
homepage: http://www.easemob.com/product/im

environment:
Expand Down