From cf538a5c794366b7dd9e1f16bacc2b0b864f8479 Mon Sep 17 00:00:00 2001
From: dujiepeng <347302029@qq.com>
Date: Sun, 5 Dec 2021 19:31:28 +0800
Subject: [PATCH 1/3] update version to 2.2.0
---
ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs
index ad0039fc..f66e9ad6 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs
@@ -61,7 +61,7 @@ public static SDKClient Instance
///
/// 获取sdk版本号
///
- public string SdkVersion { get => "2.1.0"; }
+ public string SdkVersion { get => "2.2.0"; }
///
/// 获取当前登录的环信id
From 05f94ff448ab4afbb0c1162db83ebf5e66958983 Mon Sep 17 00:00:00 2001
From: dujiepeng <347302029@qq.com>
Date: Fri, 17 Dec 2021 18:50:23 +0800
Subject: [PATCH 2/3] fix il2cpp android error.
---
.../ChatSDK/ChatManager/ChatManager_iOS.cs | 45 ++++-----
.../ChatSDK/ChatSDK/Client/Client_iOS.cs | 25 ++---
.../ContactManager/ContactManager_iOS.cs | 28 ++----
.../ConversationManager_iOS.cs | 43 ++++----
.../ChatSDK/GroupManager/GroupManager_iOS.cs | 95 ++++++++----------
.../ChatSDK/PushManager/PushManager_iOS.cs | 24 ++---
.../ChatSDK/RoomManager/RoomManager_iOS.cs | 52 ++++------
.../UserInfoManager/UserInfoManager_iOS.cs | 14 +--
.../ChatSDK/ChatSDK/native/ChatAPIIOS.cs | 71 +++++++++++++
.../Plugins/Android/libs/unity_chat_sdk.jar | Bin 106397 -> 106433 bytes
.../helper/EMMessageBodyHelper.java | 13 ++-
11 files changed, 208 insertions(+), 202 deletions(-)
create mode 100644 ChatSDKDemo/Assets/ChatSDK/ChatSDK/native/ChatAPIIOS.cs
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ChatManager/ChatManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ChatManager/ChatManager_iOS.cs
index b1047207..38f8f5fb 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ChatManager/ChatManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ChatManager/ChatManager_iOS.cs
@@ -17,7 +17,7 @@ public override bool DeleteConversation(string conversationId, bool deleteMessag
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("deleteMessages", deleteMessages);
- string ret = ChatManagerNative.ChatManager_GetMethodCall("deleteConversation", obj.ToString());
+ string ret = ChatAPIIOS.ChatManager_GetMethodCall("deleteConversation", obj.ToString());
JSONNode jn = JSON.Parse(ret);
return jn["ret"].AsBool;
}
@@ -26,14 +26,14 @@ public override void DownloadAttachment(string messageId, CallBack handle = null
{
JSONObject obj = new JSONObject();
obj.Add("msgId", messageId);
- ChatManagerNative.ChatManager_HandleMethodCall("downloadAttachment", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ChatManager_HandleMethodCall("downloadAttachment", obj.ToString(), handle?.callbackId);
}
public override void DownloadThumbnail(string messageId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("msgId", messageId);
- ChatManagerNative.ChatManager_HandleMethodCall("downloadThumbnail", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ChatManager_HandleMethodCall("downloadThumbnail", obj.ToString(), handle?.callbackId);
}
public override void FetchHistoryMessagesFromServer(string conversationId, ConversationType type, string startMessageId = null, int count = 20, ValueCallBack> handle = null)
@@ -44,7 +44,7 @@ public override void FetchHistoryMessagesFromServer(string conversationId, Conve
obj.Add("startMsgId", startMessageId ?? "");
obj.Add("count", count);
string jsonString = obj.ToString();
- ChatManagerNative.ChatManager_HandleMethodCall("fetchHistoryMessages", jsonString, handle?.callbackId);
+ ChatAPIIOS.ChatManager_HandleMethodCall("fetchHistoryMessages", jsonString, handle?.callbackId);
}
public override Conversation GetConversation(string conversationId, ConversationType type, bool createIfNeed = true)
@@ -53,7 +53,7 @@ public override Conversation GetConversation(string conversationId, Conversation
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(type));
obj.Add("createIfNeed", createIfNeed);
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("getConversation", obj.ToString());
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("getConversation", obj.ToString());
if (jsonString == null || jsonString.Length == 0)
{
return null;
@@ -63,12 +63,12 @@ public override Conversation GetConversation(string conversationId, Conversation
public override void GetConversationsFromServer(ValueCallBack> handle = null)
{
- ChatManagerNative.ChatManager_HandleMethodCall("getConversationsFromServer", null, handle?.callbackId);
+ ChatAPIIOS.ChatManager_HandleMethodCall("getConversationsFromServer", null, handle?.callbackId);
}
public override int GetUnreadMessageCount()
{
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("getUnreadMessageCount");
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("getUnreadMessageCount");
if (jsonString == null || jsonString.Length == 0) {
return 0;
}
@@ -81,7 +81,7 @@ public override bool ImportMessages(List messages)
{
JSONObject obj = new JSONObject();
obj.Add("list", TransformTool.JsonObjectFromMessageList(messages));
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("importMessages", obj.ToString());
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("importMessages", obj.ToString());
if (jsonString == null || jsonString.Length == 0) {
return false;
}
@@ -91,7 +91,7 @@ public override bool ImportMessages(List messages)
public override List LoadAllConversations()
{
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("loadAllConversations");
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("loadAllConversations");
if (jsonString == null || jsonString.Length == 0) {
return null;
}
@@ -102,7 +102,7 @@ public override Message LoadMessage(string messageId)
{
JSONObject obj = new JSONObject();
obj.Add("msgId", messageId);
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("getMessage", obj.ToString());
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("getMessage", obj.ToString());
if (jsonString == null || jsonString.Length == 0)
{
return null;
@@ -113,7 +113,7 @@ public override Message LoadMessage(string messageId)
public override bool MarkAllConversationsAsRead()
{
JSONObject obj = new JSONObject();
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("markAllChatMsgAsRead", obj.ToString());
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("markAllChatMsgAsRead", obj.ToString());
if (jsonString == null || jsonString.Length == 0)
{
return false;
@@ -126,14 +126,14 @@ public override void RecallMessage(string messageId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("msgId", messageId);
- ChatManagerNative.ChatManager_HandleMethodCall("recallMessage", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ChatManager_HandleMethodCall("recallMessage", obj.ToString(), handle?.callbackId);
}
public override Message ResendMessage(string messageId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("msgId", messageId);
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("resendMessage", obj.ToString(), handle?.callbackId);
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("resendMessage", obj.ToString(), handle?.callbackId);
if (jsonString == null || jsonString.Length == 0)
{
return null;
@@ -149,7 +149,7 @@ public override List SearchMsgFromDB(string keywords, long timestamp =
obj.Add("count", maxCount);
obj.Add("timestamp", timestamp);
obj.Add("direction", direction == MessageSearchDirection.UP ? "up" : "down");
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("searchChatMsgFromDB", obj.ToString());
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("searchChatMsgFromDB", obj.ToString());
return TransformTool.JsonStringToMessageList(jsonString);
}
@@ -157,26 +157,26 @@ public override void SendConversationReadAck(string conversationId, CallBack han
{
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
- ChatManagerNative.ChatManager_HandleMethodCall("ackConversationRead", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ChatManager_HandleMethodCall("ackConversationRead", obj.ToString(), handle?.callbackId);
}
public override void SendMessage(ref Message message, CallBack handle = null)
{
CallbackManager.Instance().tempMsgDict.Add(message.LocalTime.ToString(), message);
- ChatManagerNative.ChatManager_GetMethodCall("sendMessage", message.ToJson().ToString(), handle?.callbackId);
+ ChatAPIIOS.ChatManager_GetMethodCall("sendMessage", message.ToJson().ToString(), handle?.callbackId);
}
public override void SendMessageReadAck(string messageId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("msgId", messageId);
- ChatManagerNative.ChatManager_GetMethodCall("ackMessageRead", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ChatManager_GetMethodCall("ackMessageRead", obj.ToString(), handle?.callbackId);
}
public override bool UpdateMessage(Message message)
{
- string jsonString = ChatManagerNative.ChatManager_GetMethodCall("updateChatMessage", message.ToJson().ToString());
+ string jsonString = ChatAPIIOS.ChatManager_GetMethodCall("updateChatMessage", message.ToJson().ToString());
if (jsonString == null || jsonString.Length == 0) {
return false;
}
@@ -184,13 +184,4 @@ public override bool UpdateMessage(Message message)
return jsonObject["isLoggedIn"].AsBool;
}
}
-
- class ChatManagerNative
- {
- [DllImport("__Internal")]
- internal extern static void ChatManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string ChatManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
\ No newline at end of file
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/Client/Client_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/Client/Client_iOS.cs
index c9a2bf09..98254fea 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/Client/Client_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/Client/Client_iOS.cs
@@ -10,7 +10,7 @@ internal sealed class Client_iOS : IClient
{
public override void InitWithOptions(Options options)
{
- ClientNative.Client_HandleMethodCall("initWithOptions", options.ToJsonString(), null);
+ ChatAPIIOS.Client_HandleMethodCall("initWithOptions", options.ToJsonString(), null);
}
public override void CreateAccount(string username, string password, CallBack callBack = null)
@@ -18,7 +18,7 @@ public override void CreateAccount(string username, string password, CallBack ca
JSONObject obj = new JSONObject();
obj.Add("username", username);
obj.Add("password", password);
- ClientNative.Client_HandleMethodCall("createAccount", obj.ToString(), callBack?.callbackId);
+ ChatAPIIOS.Client_HandleMethodCall("createAccount", obj.ToString(), callBack?.callbackId);
}
public override void Login(string username, string pwdOrToken, bool isToken = false, CallBack callBack = null)
@@ -27,25 +27,25 @@ public override void Login(string username, string pwdOrToken, bool isToken = fa
obj.Add("username", username);
obj.Add("pwdOrToken", pwdOrToken);
obj.Add("isToken", isToken);
- ClientNative.Client_HandleMethodCall("login", obj.ToString(), callBack?.callbackId);
+ ChatAPIIOS.Client_HandleMethodCall("login", obj.ToString(), callBack?.callbackId);
}
public override void Logout(bool unbindDeviceToken, CallBack callBack = null)
{
JSONObject obj = new JSONObject();
obj.Add("unbindDeviceToken", unbindDeviceToken);
- ClientNative.Client_HandleMethodCall("logout", obj.ToString(), callBack?.callbackId);
+ ChatAPIIOS.Client_HandleMethodCall("logout", obj.ToString(), callBack?.callbackId);
}
public override string CurrentUsername() {
- string jsonString = ClientNative.Client_GetMethodCall("getCurrentUsername");
+ string jsonString = ChatAPIIOS.Client_GetMethodCall("getCurrentUsername");
JSONObject jo = JSON.Parse(jsonString).AsObject;
return jo["getCurrentUsername"].Value;
}
public override bool IsConnected {
get {
- string jsonString = ClientNative.Client_GetMethodCall("isConnected");
+ string jsonString = ChatAPIIOS.Client_GetMethodCall("isConnected");
JSONObject jsonObject = JSON.Parse(jsonString).AsObject;
return jsonObject["isConnected"].AsBool;
}
@@ -54,14 +54,14 @@ public override bool IsConnected {
}
public override bool IsLoggedIn() {
- string jsonString = ClientNative.Client_GetMethodCall("isLoggedIn");
+ string jsonString = ChatAPIIOS.Client_GetMethodCall("isLoggedIn");
JSONObject jsonObject = JSON.Parse(jsonString).AsObject;
return jsonObject["isLoggedIn"].AsBool;
}
public override string AccessToken()
{
- string jsonString = ClientNative.Client_GetMethodCall("accessToken");
+ string jsonString = ChatAPIIOS.Client_GetMethodCall("accessToken");
JSONObject jo = JSON.Parse(jsonString).AsObject;
return jo["accessToken"].Value;
}
@@ -82,15 +82,6 @@ public override void ClearResource()
}
}
-
- class ClientNative
- {
- [DllImport("__Internal")]
- internal extern static void Client_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string Client_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ContactManager/ContactManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ContactManager/ContactManager_iOS.cs
index 94272301..ff78feb9 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ContactManager/ContactManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ContactManager/ContactManager_iOS.cs
@@ -16,7 +16,7 @@ public override void AcceptInvitation(string username, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("username", username);
- ContactManagerNative.ContactManager_HandleMethodCall("acceptInvitation", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("acceptInvitation", obj.ToString(), handle?.callbackId);
}
public override void AddContact(string username, string reason = null, CallBack handle = null)
@@ -24,21 +24,21 @@ public override void AddContact(string username, string reason = null, CallBack
JSONObject obj = new JSONObject();
obj.Add("username", username);
obj.Add("reason", reason ?? "");
- ContactManagerNative.ContactManager_HandleMethodCall("addContact", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("addContact", obj.ToString(), handle?.callbackId);
}
public override void AddUserToBlockList(string username, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("username", username);
- ContactManagerNative.ContactManager_HandleMethodCall("addUserToBlockList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("addUserToBlockList", obj.ToString(), handle?.callbackId);
}
public override void DeclineInvitation(string username, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("username", username);
- ContactManagerNative.ContactManager_HandleMethodCall("declineInvitation", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("declineInvitation", obj.ToString(), handle?.callbackId);
}
public override void DeleteContact(string username, bool keepConversation = false, CallBack handle = null)
@@ -46,12 +46,12 @@ public override void DeleteContact(string username, bool keepConversation = fals
JSONObject obj = new JSONObject();
obj.Add("username", username);
obj.Add("keepConversation", keepConversation);
- ContactManagerNative.ContactManager_HandleMethodCall("deleteContact", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("deleteContact", obj.ToString(), handle?.callbackId);
}
public override List GetAllContactsFromDB()
{
- string jsonString = ContactManagerNative.ContactManager_GetMethodCall("getAllContactsFromDB");
+ string jsonString = ChatAPIIOS.ContactManager_GetMethodCall("getAllContactsFromDB");
if (jsonString == null || jsonString.Length == 0)
{
return null;
@@ -61,33 +61,25 @@ public override List GetAllContactsFromDB()
public override void GetAllContactsFromServer(ValueCallBack> handle = null)
{
- ContactManagerNative.ContactManager_HandleMethodCall("getAllContactsFromServer", null, handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("getAllContactsFromServer", null, handle?.callbackId);
}
public override void GetBlockListFromServer(ValueCallBack> handle = null)
{
- ContactManagerNative.ContactManager_HandleMethodCall("getBlockListFromServer", null, handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("getBlockListFromServer", null, handle?.callbackId);
}
public override void GetSelfIdsOnOtherPlatform(ValueCallBack> handle = null)
{
- ContactManagerNative.ContactManager_HandleMethodCall("getSelfIdsOnOtherPlatform", null, handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("getSelfIdsOnOtherPlatform", null, handle?.callbackId);
}
public override void RemoveUserFromBlockList(string username, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("username", username);
- ContactManagerNative.ContactManager_HandleMethodCall("removeUserFromBlockList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.ContactManager_HandleMethodCall("removeUserFromBlockList", obj.ToString(), handle?.callbackId);
}
}
- class ContactManagerNative
- {
- [DllImport("__Internal")]
- internal extern static void ContactManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string ContactManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
\ No newline at end of file
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ConversationManager/ConversationManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ConversationManager/ConversationManager_iOS.cs
index 4e858d69..f2520302 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ConversationManager/ConversationManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/ConversationManager/ConversationManager_iOS.cs
@@ -13,7 +13,7 @@ public override bool AppendMessage(string conversationId, ConversationType conve
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("msg", message.ToJson());
- string ret = ConversationNative.Conversation_GetMethodCall("appendMessage", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("appendMessage", obj.ToString());
JSONNode jn = JSON.Parse(ret);
return jn["ret"].AsBool;
}
@@ -23,7 +23,7 @@ public override bool DeleteAllMessages(string conversationId, ConversationType c
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
- string ret = ConversationNative.Conversation_GetMethodCall("clearAllMessages", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("clearAllMessages", obj.ToString());
JSONNode jn = JSON.Parse(ret);
return jn["ret"].AsBool;
}
@@ -34,7 +34,7 @@ public override bool DeleteMessage(string conversationId, ConversationType conve
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("msgId", messageId);
- string ret = ConversationNative.Conversation_GetMethodCall("removeMessage", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("removeMessage", obj.ToString());
JSONNode jn = JSON.Parse(ret);
return jn["ret"].AsBool;
}
@@ -44,7 +44,7 @@ public override Dictionary GetExt(string conversationId, Convers
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
- string ret = ConversationNative.Conversation_GetMethodCall("conversationExt", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("conversationExt", obj.ToString());
return TransformTool.JsonStringToDictionary(ret);
}
@@ -54,7 +54,7 @@ public override bool InsertMessage(string conversationId, ConversationType conve
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("msg", message.ToJson().ToString());
- string ret = ConversationNative.Conversation_GetMethodCall("insertMessage", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("insertMessage", obj.ToString());
JSONNode jn = JSON.Parse(ret);
return jn["ret"].AsBool;
}
@@ -64,7 +64,7 @@ public override Message LastMessage(string conversationId, ConversationType conv
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
- string ret = ConversationNative.Conversation_GetMethodCall("getLatestMessage", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("getLatestMessage", obj.ToString());
return new Message(ret);
}
@@ -73,7 +73,7 @@ public override Message LastReceivedMessage(string conversationId, ConversationT
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
- string ret = ConversationNative.Conversation_GetMethodCall("getLatestMessageFromOthers", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("getLatestMessageFromOthers", obj.ToString());
return new Message(ret);
}
@@ -83,7 +83,7 @@ public override Message LoadMessage(string conversationId, ConversationType conv
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("msgId", messageId);
- string ret = ConversationNative.Conversation_GetMethodCall("loadMsgWithId", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("loadMsgWithId", obj.ToString());
return new Message(ret);
}
@@ -95,7 +95,7 @@ public override void LoadMessages(string conversationId, ConversationType conver
obj.Add("startId", startMessageId ?? "");
obj.Add("count", count);
obj.Add("direction", direction == MessageSearchDirection.UP ? "up" : "down");
- ConversationNative.Conversation_HandleMethodCall("loadMsgWithStartId", obj.ToString(), callback?.callbackId);
+ ChatAPIIOS.Conversation_HandleMethodCall("loadMsgWithStartId", obj.ToString(), callback?.callbackId);
}
@@ -109,7 +109,7 @@ public override void LoadMessagesWithKeyword(string conversationId, Conversation
obj.Add("count", count);
obj.Add("timestamp", timestamp);
obj.Add("direction", direction == MessageSearchDirection.UP ? "up" : "down");
- ConversationNative.Conversation_HandleMethodCall("loadMsgWithKeywords", obj.ToString(), callback?.callbackId);
+ ChatAPIIOS.Conversation_HandleMethodCall("loadMsgWithKeywords", obj.ToString(), callback?.callbackId);
}
public override void LoadMessagesWithMsgType(string conversationId, ConversationType conversationType, MessageBodyType bodyType, string sender, long timestamp = -1, int count = 20, MessageSearchDirection direction = MessageSearchDirection.UP, ValueCallBack> callback = null)
@@ -122,7 +122,7 @@ public override void LoadMessagesWithMsgType(string conversationId, Conversation
obj.Add("count", count);
obj.Add("timestamp", timestamp);
obj.Add("direction", direction == MessageSearchDirection.UP ? "up" : "down");
- ConversationNative.Conversation_HandleMethodCall("loadMsgWithMsgType", obj.ToString(), callback?.callbackId);
+ ChatAPIIOS.Conversation_HandleMethodCall("loadMsgWithMsgType", obj.ToString(), callback?.callbackId);
}
public override void LoadMessagesWithTime(string conversationId, ConversationType conversationType, long startTime, long endTime, int count = 20, ValueCallBack> callback = null)
@@ -133,7 +133,7 @@ public override void LoadMessagesWithTime(string conversationId, ConversationTyp
obj.Add("startTime", startTime);
obj.Add("endTime", endTime);
obj.Add("count", count);
- ConversationNative.Conversation_HandleMethodCall("loadMsgWithTime", obj.ToString(), callback?.callbackId);
+ ChatAPIIOS.Conversation_HandleMethodCall("loadMsgWithTime", obj.ToString(), callback?.callbackId);
}
public override void MarkAllMessageAsRead(string conversationId, ConversationType conversationType)
@@ -141,7 +141,7 @@ public override void MarkAllMessageAsRead(string conversationId, ConversationTyp
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
- ConversationNative.Conversation_HandleMethodCall("markAllMessagesAsRead", obj.ToString());
+ ChatAPIIOS.Conversation_HandleMethodCall("markAllMessagesAsRead", obj.ToString());
}
public override void MarkMessageAsRead(string conversationId, ConversationType conversationType, string messageId)
@@ -150,7 +150,7 @@ public override void MarkMessageAsRead(string conversationId, ConversationType c
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("msgId", messageId);
- ConversationNative.Conversation_HandleMethodCall("markMessageAsRead", obj.ToString());
+ ChatAPIIOS.Conversation_HandleMethodCall("markMessageAsRead", obj.ToString());
}
public override void SetExt(string conversationId, ConversationType conversationType, Dictionary ext)
@@ -159,7 +159,7 @@ public override void SetExt(string conversationId, ConversationType conversation
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("ext", TransformTool.JsonStringFromDictionary(ext));
- ConversationNative.Conversation_HandleMethodCall("syncConversationExt", obj.ToString());
+ ChatAPIIOS.Conversation_HandleMethodCall("syncConversationExt", obj.ToString());
}
public override int UnReadCount(string conversationId, ConversationType conversationType)
@@ -167,7 +167,7 @@ public override int UnReadCount(string conversationId, ConversationType conversa
JSONObject obj = new JSONObject();
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
- string jsonString = ConversationNative.Conversation_GetMethodCall("getUnreadMsgCount", obj.ToString());
+ string jsonString = ChatAPIIOS.Conversation_GetMethodCall("getUnreadMsgCount", obj.ToString());
Dictionary dict = TransformTool.JsonStringToDictionary(jsonString);
string countString = dict["count"];
return int.Parse(countString);
@@ -179,18 +179,9 @@ public override bool UpdateMessage(string conversationId, ConversationType conve
obj.Add("convId", conversationId);
obj.Add("convType", TransformTool.ConversationTypeToInt(conversationType));
obj.Add("msg", message.ToJson());
- string ret = ConversationNative.Conversation_GetMethodCall("updateConversationMessage", obj.ToString());
+ string ret = ChatAPIIOS.Conversation_GetMethodCall("updateConversationMessage", obj.ToString());
JSONNode jn = JSON.Parse(ret);
return jn["ret"].AsBool;
}
}
-
- class ConversationNative
- {
- [DllImport("__Internal")]
- internal extern static void Conversation_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string Conversation_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
\ No newline at end of file
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/GroupManager/GroupManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/GroupManager/GroupManager_iOS.cs
index 5e903e0d..792559e9 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/GroupManager/GroupManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/GroupManager/GroupManager_iOS.cs
@@ -17,14 +17,14 @@ public override void applyJoinToGroup(string groupId, string reason, CallBack ha
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("reason", reason ?? "");
- GroupManagerNative.GroupManager_HandleMethodCall("requestToJoinPublicGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("requestToJoinPublicGroup", obj.ToString(), handle?.callbackId);
}
public override void AcceptGroupInvitation(string groupId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("acceptInvitationFromGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("acceptInvitationFromGroup", obj.ToString(), handle?.callbackId);
}
public override void AcceptGroupJoinApplication(string groupId, string username, CallBack handle = null)
@@ -32,7 +32,7 @@ public override void AcceptGroupJoinApplication(string groupId, string username,
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("username", username);
- GroupManagerNative.GroupManager_HandleMethodCall("acceptJoinApplication", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("acceptJoinApplication", obj.ToString(), handle?.callbackId);
}
public override void AddGroupAdmin(string groupId, string memberId, CallBack handle = null)
@@ -40,7 +40,7 @@ public override void AddGroupAdmin(string groupId, string memberId, CallBack han
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("memberId", memberId);
- GroupManagerNative.GroupManager_HandleMethodCall("addAdmin", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("addAdmin", obj.ToString(), handle?.callbackId);
}
public override void AddGroupMembers(string groupId, List members, CallBack handle = null)
@@ -48,7 +48,7 @@ public override void AddGroupMembers(string groupId, List members, CallB
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("addMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("addMembers", obj.ToString(), handle?.callbackId);
}
public override void AddGroupWhiteList(string groupId, List members, CallBack handle = null)
@@ -56,14 +56,14 @@ public override void AddGroupWhiteList(string groupId, List members, Cal
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("addWhiteList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("addWhiteList", obj.ToString(), handle?.callbackId);
}
public override void BlockGroup(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("blockGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("blockGroup", obj.ToString(), handle?.callbackId);
}
public override void BlockGroupMembers(string groupId, List members, CallBack handle = null)
@@ -71,7 +71,7 @@ public override void BlockGroupMembers(string groupId, List members, Cal
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("blockMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("blockMembers", obj.ToString(), handle?.callbackId);
}
public override void ChangeGroupDescription(string groupId, string desc, CallBack handle = null)
@@ -79,7 +79,7 @@ public override void ChangeGroupDescription(string groupId, string desc, CallBac
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("desc", desc);
- GroupManagerNative.GroupManager_HandleMethodCall("updateDescription", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("updateDescription", obj.ToString(), handle?.callbackId);
}
public override void ChangeGroupName(string groupId, string name, CallBack handle = null)
@@ -87,7 +87,7 @@ public override void ChangeGroupName(string groupId, string name, CallBack handl
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("name", name);
- GroupManagerNative.GroupManager_HandleMethodCall("updateGroupSubject", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("updateGroupSubject", obj.ToString(), handle?.callbackId);
}
public override void ChangeGroupOwner(string groupId, string newOwner, CallBack handle = null)
@@ -95,14 +95,14 @@ public override void ChangeGroupOwner(string groupId, string newOwner, CallBack
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("owner", newOwner);
- GroupManagerNative.GroupManager_HandleMethodCall("updateGroupOwner", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("updateGroupOwner", obj.ToString(), handle?.callbackId);
}
public override void CheckIfInGroupWhiteList(string groupId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("checkIfInGroupWhiteList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("checkIfInGroupWhiteList", obj.ToString(), handle?.callbackId);
}
public override void CreateGroup(string groupName, GroupOptions options, string desc, List inviteMembers = null, string inviteReason = null, ValueCallBack handle = null)
@@ -113,7 +113,7 @@ public override void CreateGroup(string groupName, GroupOptions options, string
obj.Add("inviteMembers", TransformTool.JsonStringFromStringList(inviteMembers));
obj.Add("inviteReason", inviteReason ?? "");
obj.Add("options", options.ToJsonString());
- GroupManagerNative.GroupManager_HandleMethodCall("createGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("createGroup", obj.ToString(), handle?.callbackId);
}
public override void DeclineGroupInvitation(string groupId, string reason = null, CallBack handle = null)
@@ -121,7 +121,7 @@ public override void DeclineGroupInvitation(string groupId, string reason = null
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("reason", reason ?? "");
- GroupManagerNative.GroupManager_HandleMethodCall("declineInvitationFromGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("declineInvitationFromGroup", obj.ToString(), handle?.callbackId);
}
public override void DeclineGroupJoinApplication(string groupId, string username, string reason = null, CallBack handle = null)
@@ -130,14 +130,14 @@ public override void DeclineGroupJoinApplication(string groupId, string username
obj.Add("groupId", groupId);
obj.Add("username", username);
obj.Add("reason", reason ?? "");
- GroupManagerNative.GroupManager_HandleMethodCall("declineJoinApplication", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("declineJoinApplication", obj.ToString(), handle?.callbackId);
}
public override void DestroyGroup(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("destroyGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("destroyGroup", obj.ToString(), handle?.callbackId);
}
public override void DownloadGroupSharedFile(string groupId, string fileId, string savePath, CallBack handle = null)
@@ -146,14 +146,14 @@ public override void DownloadGroupSharedFile(string groupId, string fileId, stri
obj.Add("groupId", groupId);
obj.Add("fileId", fileId);
obj.Add("savePath", savePath);
- GroupManagerNative.GroupManager_HandleMethodCall("downloadGroupSharedFile", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("downloadGroupSharedFile", obj.ToString(), handle?.callbackId);
}
public override void GetGroupAnnouncementFromServer(string groupId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupAnnouncementFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupAnnouncementFromServer", obj.ToString(), handle?.callbackId);
}
public override void GetGroupBlockListFromServer(string groupId, int pageNum = 1, int pageSize = 200, ValueCallBack> handle = null)
@@ -162,7 +162,7 @@ public override void GetGroupBlockListFromServer(string groupId, int pageNum = 1
obj.Add("groupId", groupId);
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupBlockListFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupBlockListFromServer", obj.ToString(), handle?.callbackId);
}
public override void GetGroupFileListFromServer(string groupId, int pageNum = 1, int pageSize = 200, ValueCallBack> handle = null)
@@ -171,7 +171,7 @@ public override void GetGroupFileListFromServer(string groupId, int pageNum = 1,
obj.Add("groupId", groupId);
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupFileListFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupFileListFromServer", obj.ToString(), handle?.callbackId);
}
public override void GetGroupMemberListFromServer(string groupId, int pageSize = 200, string cursor = "", ValueCallBack> handle = null)
@@ -180,7 +180,7 @@ public override void GetGroupMemberListFromServer(string groupId, int pageSize =
obj.Add("groupId", groupId);
obj.Add("cursor", cursor ?? "");
obj.Add("pageSize", pageSize);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupMemberListFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupMemberListFromServer", obj.ToString(), handle?.callbackId);
}
public override void GetGroupMuteListFromServer(string groupId, int pageNum = 1, int pageSize = 200, ValueCallBack> handle = null)
@@ -189,28 +189,28 @@ public override void GetGroupMuteListFromServer(string groupId, int pageNum = 1,
obj.Add("groupId", groupId);
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupMuteListFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupMuteListFromServer", obj.ToString(), handle?.callbackId);
}
public override void GetGroupSpecificationFromServer(string groupId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupSpecificationFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupSpecificationFromServer", obj.ToString(), handle?.callbackId);
}
public override void GetGroupWhiteListFromServer(string groupId, ValueCallBack> handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("getGroupWhiteListFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getGroupWhiteListFromServer", obj.ToString(), handle?.callbackId);
}
public override Group GetGroupWithId(string groupId)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- string jsonString = GroupManagerNative.GroupManager_GetMethodCall("getGroupWithId", obj.ToString());
+ string jsonString = ChatAPIIOS.GroupManager_GetMethodCall("getGroupWithId", obj.ToString());
if (jsonString == null || jsonString.Length == 0) {
return null;
}
@@ -220,7 +220,7 @@ public override Group GetGroupWithId(string groupId)
public override List GetJoinedGroups()
{
- string jsonString = GroupManagerNative.GroupManager_GetMethodCall("getJoinedGroups");
+ string jsonString = ChatAPIIOS.GroupManager_GetMethodCall("getJoinedGroups");
List list = new List();
if (jsonString == null || jsonString.Length == 0)
{
@@ -237,7 +237,7 @@ public override void FetchJoinedGroupsFromServer(int pageNum = 1, int pageSize =
JSONObject obj = new JSONObject();
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- GroupManagerNative.GroupManager_HandleMethodCall("getJoinedGroupsFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getJoinedGroupsFromServer", obj.ToString(), handle?.callbackId);
}
public override void FetchPublicGroupsFromServer(int pageSize = 200, string cursor = "", ValueCallBack> handle = null)
@@ -246,28 +246,28 @@ public override void FetchPublicGroupsFromServer(int pageSize = 200, string curs
obj.Add("cursor", cursor ?? "");
obj.Add("pageSize", pageSize);
string jsonString = obj.ToString();
- GroupManagerNative.GroupManager_HandleMethodCall("getPublicGroupsFromServer", jsonString, handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("getPublicGroupsFromServer", jsonString, handle?.callbackId);
}
public override void JoinPublicGroup(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("joinPublicGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("joinPublicGroup", obj.ToString(), handle?.callbackId);
}
public override void LeaveGroup(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("leaveGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("leaveGroup", obj.ToString(), handle?.callbackId);
}
public override void MuteGroupAllMembers(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("muteAllMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("muteAllMembers", obj.ToString(), handle?.callbackId);
}
public override void MuteGroupMembers(string groupId, List members, CallBack handle = null)
@@ -275,7 +275,7 @@ public override void MuteGroupMembers(string groupId, List members, Call
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("muteMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("muteMembers", obj.ToString(), handle?.callbackId);
}
public override void RemoveGroupAdmin(string groupId, string memberId, CallBack handle = null)
@@ -283,7 +283,7 @@ public override void RemoveGroupAdmin(string groupId, string memberId, CallBack
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("admin", memberId);
- GroupManagerNative.GroupManager_HandleMethodCall("removeAdmin", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("removeAdmin", obj.ToString(), handle?.callbackId);
}
public override void DeleteGroupSharedFile(string groupId, string fileId, CallBack handle = null)
@@ -291,7 +291,7 @@ public override void DeleteGroupSharedFile(string groupId, string fileId, CallBa
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("fileId", fileId);
- GroupManagerNative.GroupManager_HandleMethodCall("removeGroupSharedFile", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("removeGroupSharedFile", obj.ToString(), handle?.callbackId);
}
public override void DeleteGroupMembers(string groupId, List members, CallBack handle = null)
@@ -299,7 +299,7 @@ public override void DeleteGroupMembers(string groupId, List members, Ca
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("removeMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("removeMembers", obj.ToString(), handle?.callbackId);
}
public override void RemoveGroupWhiteList(string groupId, List members, CallBack handle = null)
@@ -307,14 +307,14 @@ public override void RemoveGroupWhiteList(string groupId, List members,
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("removeWhiteList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("removeWhiteList", obj.ToString(), handle?.callbackId);
}
public override void UnBlockGroup(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("unblockGroup", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("unblockGroup", obj.ToString(), handle?.callbackId);
}
public override void UnBlockGroupMembers(string groupId, List members, CallBack handle = null)
@@ -322,14 +322,14 @@ public override void UnBlockGroupMembers(string groupId, List members, C
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("unblockMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("unblockMembers", obj.ToString(), handle?.callbackId);
}
public override void UnMuteGroupAllMembers(string groupId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
- GroupManagerNative.GroupManager_HandleMethodCall("unMuteAllMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("unMuteAllMembers", obj.ToString(), handle?.callbackId);
}
public override void UnMuteGroupMembers(string groupId, List members, CallBack handle = null)
@@ -337,7 +337,7 @@ public override void UnMuteGroupMembers(string groupId, List members, Ca
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- GroupManagerNative.GroupManager_HandleMethodCall("unMuteMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("unMuteMembers", obj.ToString(), handle?.callbackId);
}
public override void UpdateGroupAnnouncement(string groupId, string announcement, CallBack handle = null)
@@ -345,7 +345,7 @@ public override void UpdateGroupAnnouncement(string groupId, string announcement
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("announcement", announcement ?? "");
- GroupManagerNative.GroupManager_HandleMethodCall("updateGroupAnnouncement", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("updateGroupAnnouncement", obj.ToString(), handle?.callbackId);
}
public override void UpdateGroupExt(string groupId, string ext, CallBack handle = null)
@@ -353,7 +353,7 @@ public override void UpdateGroupExt(string groupId, string ext, CallBack handle
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("ext", ext ?? "");
- GroupManagerNative.GroupManager_HandleMethodCall("updateGroupExt", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("updateGroupExt", obj.ToString(), handle?.callbackId);
}
public override void UploadGroupSharedFile(string groupId, string filePath, CallBack handle = null)
@@ -361,16 +361,7 @@ public override void UploadGroupSharedFile(string groupId, string filePath, Call
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("filePath", filePath);
- GroupManagerNative.GroupManager_HandleMethodCall("uploadGroupSharedFile", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.GroupManager_HandleMethodCall("uploadGroupSharedFile", obj.ToString(), handle?.callbackId);
}
}
-
- class GroupManagerNative
- {
- [DllImport("__Internal")]
- internal extern static void GroupManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string GroupManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
\ No newline at end of file
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/PushManager/PushManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/PushManager/PushManager_iOS.cs
index bf1fb73a..803aa22d 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/PushManager/PushManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/PushManager/PushManager_iOS.cs
@@ -8,7 +8,7 @@ internal sealed class PushManager_iOS : IPushManager
{
public List GetNoDisturbGroups()
{
- string jsonString = PushManagerNative.PushManager_GetMethodCall("getNoDisturbGroups");
+ string jsonString = ChatAPIIOS.PushManager_GetMethodCall("getNoDisturbGroups");
if (jsonString == null || jsonString.Length == 0)
{
return null;
@@ -18,7 +18,7 @@ public List GetNoDisturbGroups()
public PushConfig GetPushConfig()
{
- string jsonString = PushManagerNative.PushManager_GetMethodCall("getPushConfig", null, null);
+ string jsonString = ChatAPIIOS.PushManager_GetMethodCall("getPushConfig", null, null);
if(jsonString == null || jsonString.Length == 0)
{
return null;
@@ -28,7 +28,7 @@ public PushConfig GetPushConfig()
public void GetPushConfigFromServer(ValueCallBack handle = null)
{
- PushManagerNative.PushManager_HandleMethodCall("getPushConfigFromServer", null, handle?.callbackId);
+ ChatAPIIOS.PushManager_HandleMethodCall("getPushConfigFromServer", null, handle?.callbackId);
}
public void SetGroupToDisturb(string groupId, bool noDisturb, CallBack handle = null)
@@ -36,7 +36,7 @@ public void SetGroupToDisturb(string groupId, bool noDisturb, CallBack handle =
JSONObject obj = new JSONObject();
obj.Add("groupId", groupId);
obj.Add("noDisturb", noDisturb);
- PushManagerNative.PushManager_HandleMethodCall("updateGroupPushService", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.PushManager_HandleMethodCall("updateGroupPushService", obj.ToString(), handle?.callbackId);
}
public void SetNoDisturb(bool noDisturb, int startTime = 0, int endTime = 24, CallBack handle = null)
@@ -45,14 +45,14 @@ public void SetNoDisturb(bool noDisturb, int startTime = 0, int endTime = 24, Ca
obj.Add("noDisturb", noDisturb);
obj.Add("startTime", startTime);
obj.Add("endTime", endTime);
- PushManagerNative.PushManager_HandleMethodCall("PushNoDisturb", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.PushManager_HandleMethodCall("PushNoDisturb", obj.ToString(), handle?.callbackId);
}
public void SetPushStyle(PushStyle pushStyle, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("style", pushStyle == PushStyle.Simple ? 0 : 1 );
- PushManagerNative.PushManager_HandleMethodCall("updatePushStyle", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.PushManager_HandleMethodCall("updatePushStyle", obj.ToString(), handle?.callbackId);
}
public void UpdateFCMPushToken(string token, CallBack handle = null)
@@ -69,23 +69,15 @@ public void UpdateAPNSPuthToken(string token, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("deviceToken", token);
- PushManagerNative.PushManager_HandleMethodCall("updateDeviceToken", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.PushManager_HandleMethodCall("updateDeviceToken", obj.ToString(), handle?.callbackId);
}
public void UpdatePushNickName(string nickname, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("nickname", nickname);
- PushManagerNative.PushManager_HandleMethodCall("updatePushNickname", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.PushManager_HandleMethodCall("updatePushNickname", obj.ToString(), handle?.callbackId);
}
}
- class PushManagerNative
- {
- [DllImport("__Internal")]
- internal extern static void PushManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string PushManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/RoomManager/RoomManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/RoomManager/RoomManager_iOS.cs
index de96e792..13addbbb 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/RoomManager/RoomManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/RoomManager/RoomManager_iOS.cs
@@ -16,7 +16,7 @@ public override void AddRoomAdmin(string roomId, string memberId, CallBack handl
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("admin", memberId);
- RoomManagerNative.RoomManager_HandleMethodCall("addChatRoomAdmin", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("addChatRoomAdmin", obj.ToString(), handle?.callbackId);
}
public override void BlockRoomMembers(string roomId, List members, CallBack handle = null)
@@ -24,7 +24,7 @@ public override void BlockRoomMembers(string roomId, List members, CallB
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- RoomManagerNative.RoomManager_HandleMethodCall("blockChatRoomMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("blockChatRoomMembers", obj.ToString(), handle?.callbackId);
}
public override void ChangeRoomOwner(string roomId, string newOwner, CallBack handle = null)
@@ -32,7 +32,7 @@ public override void ChangeRoomOwner(string roomId, string newOwner, CallBack ha
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("newOwner", newOwner);
- RoomManagerNative.RoomManager_HandleMethodCall("changeChatRoomOwner", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("changeChatRoomOwner", obj.ToString(), handle?.callbackId);
}
public override void ChangeRoomDescription(string roomId, string newDescription, CallBack handle = null)
@@ -40,7 +40,7 @@ public override void ChangeRoomDescription(string roomId, string newDescription,
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("desc", newDescription);
- RoomManagerNative.RoomManager_HandleMethodCall("changeChatRoomDescription", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("changeChatRoomDescription", obj.ToString(), handle?.callbackId);
}
public override void ChangeRoomName(string roomId, string newName, CallBack handle = null)
@@ -48,7 +48,7 @@ public override void ChangeRoomName(string roomId, string newName, CallBack hand
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("subject", newName);
- RoomManagerNative.RoomManager_HandleMethodCall("changeChatRoomSubject", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("changeChatRoomSubject", obj.ToString(), handle?.callbackId);
}
public override void CreateRoom(string subject, string descriptions, string welcomeMsg, int maxUserCount = 300, List members = null, ValueCallBack handle = null)
@@ -59,14 +59,14 @@ public override void CreateRoom(string subject, string descriptions, string welc
obj.Add("maxUserCount", maxUserCount);
obj.Add("welcomeMsg", welcomeMsg ?? "");
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- RoomManagerNative.RoomManager_HandleMethodCall("createChatroom", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("createChatroom", obj.ToString(), handle?.callbackId);
}
public override void DestroyRoom(string roomId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
- RoomManagerNative.RoomManager_HandleMethodCall("destroyChatRoom", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("destroyChatRoom", obj.ToString(), handle?.callbackId);
}
public override void FetchPublicRoomsFromServer(int pageNum = 1, int pageSize = 200, ValueCallBack> handle = null)
@@ -74,14 +74,14 @@ public override void FetchPublicRoomsFromServer(int pageNum = 1, int pageSize =
JSONObject obj = new JSONObject();
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- RoomManagerNative.RoomManager_HandleMethodCall("fetchPublicChatRoomsFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("fetchPublicChatRoomsFromServer", obj.ToString(), handle?.callbackId);
}
public override void FetchRoomAnnouncement(string roomId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
- RoomManagerNative.RoomManager_HandleMethodCall("fetchChatRoomAnnouncement", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("fetchChatRoomAnnouncement", obj.ToString(), handle?.callbackId);
}
public override void FetchRoomBlockList(string roomId, int pageNum = 1, int pageSize = 200, ValueCallBack> handle = null)
@@ -90,14 +90,14 @@ public override void FetchRoomBlockList(string roomId, int pageNum = 1, int page
obj.Add("roomId", roomId);
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- RoomManagerNative.RoomManager_HandleMethodCall("fetchChatRoomBlockList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("fetchChatRoomBlockList", obj.ToString(), handle?.callbackId);
}
public override void FetchRoomInfoFromServer(string roomId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
- RoomManagerNative.RoomManager_HandleMethodCall("fetchChatRoomInfoFromServer", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("fetchChatRoomInfoFromServer", obj.ToString(), handle?.callbackId);
}
public override void FetchRoomMembers(string roomId, string cursor = "", int pageSize = 200, ValueCallBack> handle = null)
@@ -106,7 +106,7 @@ public override void FetchRoomMembers(string roomId, string cursor = "", int pag
obj.Add("roomId", roomId);
obj.Add("cursor", cursor);
obj.Add("pageSize", pageSize);
- RoomManagerNative.RoomManager_HandleMethodCall("fetchChatRoomMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("fetchChatRoomMembers", obj.ToString(), handle?.callbackId);
}
public override void FetchRoomMuteList(string roomId, int pageSize = 1, int pageNum = 200, ValueCallBack> handle = null)
@@ -115,21 +115,21 @@ public override void FetchRoomMuteList(string roomId, int pageSize = 1, int page
obj.Add("roomId", roomId);
obj.Add("pageNum", pageNum);
obj.Add("pageSize", pageSize);
- RoomManagerNative.RoomManager_HandleMethodCall("fetchChatRoomMuteList", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("fetchChatRoomMuteList", obj.ToString(), handle?.callbackId);
}
public override void JoinRoom(string roomId, ValueCallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
- RoomManagerNative.RoomManager_HandleMethodCall("joinChatRoom", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("joinChatRoom", obj.ToString(), handle?.callbackId);
}
public override void LeaveRoom(string roomId, CallBack handle = null)
{
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
- RoomManagerNative.RoomManager_HandleMethodCall("leaveChatRoom", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("leaveChatRoom", obj.ToString(), handle?.callbackId);
}
public override void MuteRoomMembers(string roomId, List members, CallBack handle = null)
@@ -137,7 +137,7 @@ public override void MuteRoomMembers(string roomId, List members, CallBa
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- RoomManagerNative.RoomManager_HandleMethodCall("muteChatRoomMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("muteChatRoomMembers", obj.ToString(), handle?.callbackId);
}
public override void RemoveRoomAdmin(string roomId, string adminId, CallBack handle = null)
@@ -145,7 +145,7 @@ public override void RemoveRoomAdmin(string roomId, string adminId, CallBack han
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("admin", adminId);
- RoomManagerNative.RoomManager_HandleMethodCall("removeChatRoomAdmin", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("removeChatRoomAdmin", obj.ToString(), handle?.callbackId);
}
public override void DeleteRoomMembers(string roomId, List members, CallBack handle = null)
@@ -153,7 +153,7 @@ public override void DeleteRoomMembers(string roomId, List members, Call
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- RoomManagerNative.RoomManager_HandleMethodCall("removeChatRoomMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("removeChatRoomMembers", obj.ToString(), handle?.callbackId);
}
public override void UnBlockRoomMembers(string roomId, List members, CallBack handle = null)
@@ -161,7 +161,7 @@ public override void UnBlockRoomMembers(string roomId, List members, Cal
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- RoomManagerNative.RoomManager_HandleMethodCall("unBlockChatRoomMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("unBlockChatRoomMembers", obj.ToString(), handle?.callbackId);
}
public override void UnMuteRoomMembers(string roomId, List members, CallBack handle = null)
@@ -169,7 +169,7 @@ public override void UnMuteRoomMembers(string roomId, List members, Call
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("members", TransformTool.JsonStringFromStringList(members));
- RoomManagerNative.RoomManager_HandleMethodCall("unMuteChatRoomMembers", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("unMuteChatRoomMembers", obj.ToString(), handle?.callbackId);
}
public override void UpdateRoomAnnouncement(string roomId, string announcement, CallBack handle = null)
@@ -177,17 +177,7 @@ public override void UpdateRoomAnnouncement(string roomId, string announcement,
JSONObject obj = new JSONObject();
obj.Add("roomId", roomId);
obj.Add("announcement", announcement);
- RoomManagerNative.RoomManager_HandleMethodCall("updateChatRoomAnnouncement", obj.ToString(), handle?.callbackId);
+ ChatAPIIOS.RoomManager_HandleMethodCall("updateChatRoomAnnouncement", obj.ToString(), handle?.callbackId);
}
}
-
-
- class RoomManagerNative
- {
- [DllImport("__Internal")]
- internal extern static void RoomManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string RoomManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
\ No newline at end of file
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/UserInfoManager/UserInfoManager_iOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/UserInfoManager/UserInfoManager_iOS.cs
index 869b843e..d5968f89 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/UserInfoManager/UserInfoManager_iOS.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/UserInfoManager/UserInfoManager_iOS.cs
@@ -17,7 +17,7 @@ internal void FetchUserInfoByAttribute(List idList, List a
public override void FetchUserInfoByUserId(List idList, ValueCallBack> handle = null)
{
string jsonString = TransformTool.JsonStringFromStringList(idList);
- UserInfoManagerNative.UserInfoManager_MethodCall("fetchUserInfoByUserId", jsonString, callbackId: handle?.callbackId);
+ ChatAPIIOS.UserInfoManager_MethodCall("fetchUserInfoByUserId", jsonString, callbackId: handle?.callbackId);
}
@@ -30,18 +30,8 @@ internal void UpdateOwnByAttribute(UserInfoType userInfoType, string value, Valu
public override void UpdateOwnInfo(UserInfo userInfo, CallBack handle = null)
{
string jsonString = TransformTool.JsonStringFromUserInfo(userInfo);
- UserInfoManagerNative.UserInfoManager_MethodCall("updateOwnInfo", jsonString, callbackId:handle?.callbackId);
+ ChatAPIIOS.UserInfoManager_MethodCall("updateOwnInfo", jsonString, callbackId:handle?.callbackId);
}
}
-
-
- class UserInfoManagerNative
- {
- [DllImport("__Internal")]
- internal extern static void UserInfoManager_MethodCall(string methodName, string jsonString = null, string callbackId = null);
-
- [DllImport("__Internal")]
- internal extern static string UserInfoManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
- }
}
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/native/ChatAPIIOS.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/native/ChatAPIIOS.cs
new file mode 100644
index 00000000..7335b70f
--- /dev/null
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/native/ChatAPIIOS.cs
@@ -0,0 +1,71 @@
+using System.Runtime.InteropServices;
+using System;
+
+namespace ChatSDK
+{
+ public sealed class ChatAPIIOS
+ {
+ #region DllImport
+
+#if UNITY_IPHONE
+
+ public const string MyLibName = "__Internal";
+
+#else
+
+ public const string MyLibName = "hyphenateCWrapper";
+
+#endif
+ [DllImport(MyLibName)]
+ internal extern static void Client_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string Client_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void ChatManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string ChatManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void Conversation_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string Conversation_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void ContactManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string ContactManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void GroupManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string GroupManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void RoomManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string RoomManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void UserInfoManager_MethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string UserInfoManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static void PushManager_HandleMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ [DllImport(MyLibName)]
+ internal extern static string PushManager_GetMethodCall(string methodName, string jsonString = null, string callbackId = null);
+
+ #endregion iOS API import
+ }
+}
+
+
diff --git a/ChatSDKDemo/Assets/ChatSDK/Plugins/Android/libs/unity_chat_sdk.jar b/ChatSDKDemo/Assets/ChatSDK/Plugins/Android/libs/unity_chat_sdk.jar
index c0c46ca988c57542a5f2c1cdf7de4bacb41671b3..439107898871b6b8f7f31162575613cefafedac5 100644
GIT binary patch
delta 9738
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
K1K~$1=>GvoKcGwi
diff --git a/Unity_SDK/android_build/unity_chat_sdk/src/main/java/com/hyphenate/unity_chat_sdk/helper/EMMessageBodyHelper.java b/Unity_SDK/android_build/unity_chat_sdk/src/main/java/com/hyphenate/unity_chat_sdk/helper/EMMessageBodyHelper.java
index a75fea3c..425d2bde 100644
--- a/Unity_SDK/android_build/unity_chat_sdk/src/main/java/com/hyphenate/unity_chat_sdk/helper/EMMessageBodyHelper.java
+++ b/Unity_SDK/android_build/unity_chat_sdk/src/main/java/com/hyphenate/unity_chat_sdk/helper/EMMessageBodyHelper.java
@@ -231,7 +231,11 @@ public static EMVideoMessageBody videoBodyFromJson(JSONObject json) throws JSONE
int duration = json.getInt("duration");
int fileSize = json.getInt("fileSize");
EMVideoMessageBody body = new EMVideoMessageBody(localPath, "", duration, fileSize);
- body.setThumbnailUrl(json.getString("thumbnailRemotePath"));
+
+ if (json.has("thumbnailRemotePath")){
+ body.setThumbnailUrl(json.getString("thumbnailRemotePath"));
+ }
+
if (json.has("thumbnailLocalPath")) {
body.setLocalThumb(json.getString("thumbnailLocalPath"));
}
@@ -248,7 +252,11 @@ public static EMVideoMessageBody videoBodyFromJson(JSONObject json) throws JSONE
body.setSecret(json.getString("secret"));
}
- body.setFileLength(json.getInt("fileSize"));
+ if(json.has("fileSize")) {
+ body.setFileLength(json.getInt("fileSize"));
+ }
+
+
body.setDownloadStatus(downloadStatusFromInt(json.getInt("fileStatus")));
int width = json.getInt("height");
int height = json.getInt("width");
@@ -280,7 +288,6 @@ public static JSONObject videoBodyToJson(EMVideoMessageBody body) throws JSONExc
data.put("secret", body.getSecret());
}
data.put("fileStatus", downloadStatusToInt(body.downloadStatus()));
-
data.put("duration", body.getDuration());
data.put("fileSize", body.getVideoFileLength());
data.put("height", body.getThumbnailHeight());
From c114ef2e2d84b366709ec507c34841125da7b025 Mon Sep 17 00:00:00 2001
From: dujiepeng <347302029@qq.com>
Date: Wed, 22 Dec 2021 12:24:13 +0800
Subject: [PATCH 3/3] upgrade version
---
ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs
index f66e9ad6..bcd72790 100644
--- a/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs
+++ b/ChatSDKDemo/Assets/ChatSDK/ChatSDK/SDKClient.cs
@@ -61,7 +61,7 @@ public static SDKClient Instance
///
/// 获取sdk版本号
///
- public string SdkVersion { get => "2.2.0"; }
+ public string SdkVersion { get => "2.2.3"; }
///
/// 获取当前登录的环信id