Skip to content
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

fix: map.toString is replaced with readableMap2string #28

Closed
wants to merge 3 commits into from
Closed

fix: map.toString is replaced with readableMap2string #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8286691
fix: 修复ReadableMap tostring方法兼容性
OrrinHatch Aug 10, 2024
14d5476
fix: 修复类型错误
OrrinHatch Aug 11, 2024
f1281a3
fix: 误删yarn版本锁定
OrrinHatch Aug 11, 2024
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
22 changes: 11 additions & 11 deletions android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public void createTextAtMessage(ReadableMap options, String operationID, Promise
String atUsersInfo = atUsersInfoMap != null ? atUsersInfoMap.toString() : null;

ReadableMap messageMap = options.hasKey("message") ? options.getMap("message") : null;
String quoteMessage = messageMap != null ? messageMap.toString() : null;
String quoteMessage = messageMap != null ? readableMap2string(messageMap) : null;

String message = Open_im_sdk.createTextAtMessage(operationID, text, atUserIDList, atUsersInfo, quoteMessage);
try {
Expand Down Expand Up @@ -360,7 +360,7 @@ public void createCustomMessage(ReadableMap options, String operationID, Promise
@ReactMethod
public void createQuoteMessage(ReadableMap options, String operationID, Promise promise) {
String text = options.getString("text");
String quoteMessage = Objects.requireNonNull(options.getMap("message")).toString();
String quoteMessage = readableMap2string(Objects.requireNonNull(options.getMap("message")));

String message = Open_im_sdk.createQuoteMessage(operationID, text, quoteMessage);
try {
Expand All @@ -374,7 +374,7 @@ public void createQuoteMessage(ReadableMap options, String operationID, Promise
@ReactMethod
public void createAdvancedQuoteMessage(ReadableMap options, String operationID, Promise promise) {
String text = options.getString("text");
String quoteMessage = Objects.requireNonNull(options.getMap("message")).toString();
String quoteMessage = readableMap2string(Objects.requireNonNull(options.getMap("message")));
String messageEntityList = Objects.requireNonNull(options.getArray("messageEntityList")).toString();

String message = Open_im_sdk.createAdvancedQuoteMessage(operationID, text, quoteMessage, messageEntityList);
Expand Down Expand Up @@ -423,9 +423,9 @@ public void createImageMessageFromFullPath(String imagePath, String operationID,

@ReactMethod
public void createImageMessageByURL(ReadableMap options, String operationID, Promise promise) {
String sourcePicture = Objects.requireNonNull(options.getMap("sourcePicture")).toString();
String bigPicture = Objects.requireNonNull(options.getMap("bigPicture")).toString();
String snapshotPicture = Objects.requireNonNull(options.getMap("snapshotPicture")).toString();
String sourcePicture = readableMap2string(Objects.requireNonNull(options.getMap("sourcePicture")));
String bigPicture = readableMap2string(Objects.requireNonNull(options.getMap("bigPicture")));
String snapshotPicture =readableMap2string(Objects.requireNonNull(options.getMap("snapshotPicture")));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note formatting

String sourcePath = options.getString("sourcePath");

String message = Open_im_sdk.createImageMessageByURL(operationID, sourcePath, sourcePicture, bigPicture, snapshotPicture);
Expand Down Expand Up @@ -688,18 +688,18 @@ public void deleteConversationAndDeleteAllMsg(String conversationID, String oper
@ReactMethod
public void insertSingleMessageToLocalStorage(ReadableMap options, String operationID, Promise promise) {
Open_im_sdk.insertSingleMessageToLocalStorage(new BaseImpl(promise), operationID,
Objects.requireNonNull(options.getMap("message")).toString(), options.getString("recvID"), options.getString("sendID"));
readableMap2string(Objects.requireNonNull(options.getMap("message"))), options.getString("recvID"), options.getString("sendID"));
}

@ReactMethod
public void insertGroupMessageToLocalStorage(ReadableMap options, String operationID, Promise promise) {
Open_im_sdk.insertGroupMessageToLocalStorage(new BaseImpl(promise), operationID,
Objects.requireNonNull(options.getMap("message")).toString(), options.getString("groupID"), options.getString("sendID"));
readableMap2string(Objects.requireNonNull(options.getMap("message"))), options.getString("groupID"), options.getString("sendID"));
}

@ReactMethod
public void searchLocalMessages(ReadableMap searchParam, String operationID, Promise promise) {
Open_im_sdk.searchLocalMessages(new BaseImpl(promise), operationID, searchParam.toString());
Open_im_sdk.searchLocalMessages(new BaseImpl(promise), operationID, readableMap2string(searchParam));
}

@ReactMethod
Expand Down Expand Up @@ -1016,7 +1016,7 @@ public void sendMessage(ReadableMap options, String operationID, Promise promise
}

assert message != null;
Open_im_sdk.sendMessage(new SendMsgCallBack(reactContext, promise, message), operationID, message.toString(), receiver, groupID, offlinePushInfo.toString(), isOnlineOnly);
Open_im_sdk.sendMessage(new SendMsgCallBack(reactContext, promise, message), operationID, readableMap2string(message), receiver, groupID, readableMap2string(offlinePushInfo), isOnlineOnly);
}

@ReactMethod
Expand All @@ -1042,7 +1042,7 @@ public void sendMessageNotOss(ReadableMap options, String operationID, Promise p
}

assert message != null;
Open_im_sdk.sendMessageNotOss(new SendMsgCallBack(reactContext, promise, message), operationID, message.toString(), receiver, groupID, offlinePushInfo.toString(), isOnlineOnly);
Open_im_sdk.sendMessageNotOss(new SendMsgCallBack(reactContext, promise, message), operationID, readableMap2string(message), receiver, groupID, readableMap2string(offlinePushInfo), isOnlineOnly);
}

@ReactMethod
Expand Down