From 8286691c5f0984d317da9f2f74596e742e11d33a Mon Sep 17 00:00:00 2001 From: Curry Date: Sat, 10 Aug 2024 17:57:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DReadableMap=20tost?= =?UTF-8?q?ring=E6=96=B9=E6=B3=95=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/openimsdkrn/OpenImSdkRnModule.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java b/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java index d14b98d..87d8f6c 100644 --- a/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java +++ b/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java @@ -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 { @@ -360,9 +360,9 @@ 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 = Objects.requireNonNull(options.getMap("message")); - String message = Open_im_sdk.createQuoteMessage(operationID, text, quoteMessage); + String message = Open_im_sdk.createQuoteMessage(operationID, text, readableMap2string(quoteMessage)); try { JSONObject obj = JSON.parseObject(message); promise.resolve(emitter.convertJsonToMap(obj)); @@ -374,10 +374,10 @@ 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 = Objects.requireNonNull(options.getMap("message")); String messageEntityList = Objects.requireNonNull(options.getArray("messageEntityList")).toString(); - String message = Open_im_sdk.createAdvancedQuoteMessage(operationID, text, quoteMessage, messageEntityList); + String message = Open_im_sdk.createAdvancedQuoteMessage(operationID, text, readableMap2string(quoteMessage), messageEntityList); try { JSONObject obj = JSON.parseObject(message); promise.resolve(emitter.convertJsonToMap(obj)); @@ -423,12 +423,12 @@ 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 = Objects.requireNonNull(options.getMap("sourcePicture")); + String bigPicture = Objects.requireNonNull(options.getMap("bigPicture")); + String snapshotPicture = Objects.requireNonNull(options.getMap("snapshotPicture")); String sourcePath = options.getString("sourcePath"); - String message = Open_im_sdk.createImageMessageByURL(operationID, sourcePath, sourcePicture, bigPicture, snapshotPicture); + String message = Open_im_sdk.createImageMessageByURL(operationID, sourcePath, readableMap2string(sourcePicture), readableMap2string(bigPicture), readableMap2string(snapshotPicture)); try { JSONObject obj = JSON.parseObject(message); promise.resolve(emitter.convertJsonToMap(obj)); @@ -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 @@ -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 @@ -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 From 14d54762d2d3ef88461801a5a5a5b5046763069e Mon Sep 17 00:00:00 2001 From: Curry Date: Mon, 12 Aug 2024 00:17:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/openimsdkrn/OpenImSdkRnModule.java | 16 ++++++++-------- package.json | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java b/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java index 87d8f6c..4502e91 100644 --- a/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java +++ b/android/src/main/java/com/openimsdkrn/OpenImSdkRnModule.java @@ -360,9 +360,9 @@ 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")); + String quoteMessage = readableMap2string(Objects.requireNonNull(options.getMap("message"))); - String message = Open_im_sdk.createQuoteMessage(operationID, text, readableMap2string(quoteMessage)); + String message = Open_im_sdk.createQuoteMessage(operationID, text, quoteMessage); try { JSONObject obj = JSON.parseObject(message); promise.resolve(emitter.convertJsonToMap(obj)); @@ -374,10 +374,10 @@ 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")); + String quoteMessage = readableMap2string(Objects.requireNonNull(options.getMap("message"))); String messageEntityList = Objects.requireNonNull(options.getArray("messageEntityList")).toString(); - String message = Open_im_sdk.createAdvancedQuoteMessage(operationID, text, readableMap2string(quoteMessage), messageEntityList); + String message = Open_im_sdk.createAdvancedQuoteMessage(operationID, text, quoteMessage, messageEntityList); try { JSONObject obj = JSON.parseObject(message); promise.resolve(emitter.convertJsonToMap(obj)); @@ -423,12 +423,12 @@ public void createImageMessageFromFullPath(String imagePath, String operationID, @ReactMethod public void createImageMessageByURL(ReadableMap options, String operationID, Promise promise) { - String sourcePicture = Objects.requireNonNull(options.getMap("sourcePicture")); - String bigPicture = Objects.requireNonNull(options.getMap("bigPicture")); - String snapshotPicture = Objects.requireNonNull(options.getMap("snapshotPicture")); + String sourcePicture = readableMap2string(Objects.requireNonNull(options.getMap("sourcePicture"))); + String bigPicture = readableMap2string(Objects.requireNonNull(options.getMap("bigPicture"))); + String snapshotPicture =readableMap2string(Objects.requireNonNull(options.getMap("snapshotPicture"))); String sourcePath = options.getString("sourcePath"); - String message = Open_im_sdk.createImageMessageByURL(operationID, sourcePath, readableMap2string(sourcePicture), readableMap2string(bigPicture), readableMap2string(snapshotPicture)); + String message = Open_im_sdk.createImageMessageByURL(operationID, sourcePath, sourcePicture, bigPicture, snapshotPicture); try { JSONObject obj = JSON.parseObject(message); promise.resolve(emitter.convertJsonToMap(obj)); diff --git a/package.json b/package.json index 2268477..3568f5c 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,6 @@ "engines": { "node": ">= 16.0.0" }, - "packageManager": "^yarn@1.22.15", "jest": { "preset": "react-native", "modulePathIgnorePatterns": [ From f1281a3f91f62461d89966242d9220d0f95acb14 Mon Sep 17 00:00:00 2001 From: Curry Date: Mon, 12 Aug 2024 00:20:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=AF=AF=E5=88=A0yarn=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 3568f5c..2268477 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "engines": { "node": ">= 16.0.0" }, + "packageManager": "^yarn@1.22.15", "jest": { "preset": "react-native", "modulePathIgnorePatterns": [