From c0839d3a609f47e8557b562537aa8a08fc1edb56 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Sat, 18 May 2024 16:40:37 +0800 Subject: [PATCH] refactor: change cpp structure. --- c/src/test.c | 2 +- scripts/openimsdkcc.h => cpp/include/libopenimsdkcc.h | 2 +- {scripts => cpp/include}/wrapp_cpp_function.inc | 0 scripts/openimsdkcc.cc => cpp/src/libopenimsdkcc.cc | 4 ++-- go/export.go | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-) rename scripts/openimsdkcc.h => cpp/include/libopenimsdkcc.h (99%) rename {scripts => cpp/include}/wrapp_cpp_function.inc (100%) rename scripts/openimsdkcc.cc => cpp/src/libopenimsdkcc.cc (99%) diff --git a/c/src/test.c b/c/src/test.c index aabdc09..fa7aa0d 100644 --- a/c/src/test.c +++ b/c/src/test.c @@ -56,7 +56,7 @@ int main(int argc, char **argv) printf("return :%s\n",loginUserID); char operationID1[] = "12345,create"; - char *message = create_text_message(operationID1, "哈哈"); + char *message = create_text_message(operationID1, "hello"); printf("return :%s\n",message); char operationID2[] = "12345,get_all_conversation_list"; get_all_conversation_list(c_base_callback, operationID2); diff --git a/scripts/openimsdkcc.h b/cpp/include/libopenimsdkcc.h similarity index 99% rename from scripts/openimsdkcc.h rename to cpp/include/libopenimsdkcc.h index 12dcc89..9260c45 100644 --- a/scripts/openimsdkcc.h +++ b/cpp/include/libopenimsdkcc.h @@ -1,6 +1,6 @@ #pragma once -#include "openimsdk.h" +#include "libopenimsdk.h" #include #include #include diff --git a/scripts/wrapp_cpp_function.inc b/cpp/include/wrapp_cpp_function.inc similarity index 100% rename from scripts/wrapp_cpp_function.inc rename to cpp/include/wrapp_cpp_function.inc diff --git a/scripts/openimsdkcc.cc b/cpp/src/libopenimsdkcc.cc similarity index 99% rename from scripts/openimsdkcc.cc rename to cpp/src/libopenimsdkcc.cc index 9d66546..ac748e3 100644 --- a/scripts/openimsdkcc.cc +++ b/cpp/src/libopenimsdkcc.cc @@ -1,6 +1,6 @@ -#include "openimsdkcc.h" +#include "../include/libopenimsdk.h" -#include "wrapp_cpp_function.inc" +#include "../include/wrapp_cpp_function.inc" namespace openim { diff --git a/go/export.go b/go/export.go index 58066b2..bdb3436 100644 --- a/go/export.go +++ b/go/export.go @@ -594,6 +594,12 @@ func set_conversation_is_msg_destruct(cCallback C.CB_S_I_S_S, operationID *C.cha open_im_sdk.SetConversationIsMsgDestruct(baseCallback, C.GoString(operationID), C.GoString(conversationID), parseBool(int(isMsgDestruct))) } +//export set_conversation_ex +func set_conversation_ex(cCallback C.CB_S_I_S_S, operationID *C.char, conversationID *C.char, ex *C.char) { + baseCallback := NewBaseCallback(cCallback, operationID) + open_im_sdk.SetConversationEx(baseCallback, C.GoString(operationID), C.GoString(conversationID), C.GoString(ex)) +} + //export hide_conversation func hide_conversation(cCallback C.CB_S_I_S_S, operationID *C.char, conversationID *C.char) { baseCallback := NewBaseCallback(cCallback, operationID)