diff --git a/.idea/flutter_openim_sdk.iml b/.idea/flutter_openim_sdk.iml new file mode 100644 index 0000000..c03edf4 --- /dev/null +++ b/.idea/flutter_openim_sdk.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml new file mode 100644 index 0000000..f03fdfd --- /dev/null +++ b/.idea/libraries/Dart_Packages.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ios/Classes/CommonUtil.swift b/ios/Classes/CommonUtil.swift index 66496e2..310d67e 100644 --- a/ios/Classes/CommonUtil.swift +++ b/ios/Classes/CommonUtil.swift @@ -180,6 +180,11 @@ public class CommonUtil { return result } + public static func getGroupMessageGroupid(methodCall: FlutterMethodCall)->String{ + let result: String = getParamValue(methodCall: methodCall, param: KEY_GROUP_MESSAGE_GROUPID) as! String + return result + } + public static func getSingleMessageSender(methodCall: FlutterMethodCall)->String{ let result: String = getParamValue(methodCall: methodCall, param: KEY_SINGLE_MESSAGE_SENDER) as! String return result @@ -203,7 +208,7 @@ public class CommonUtil { } public static func getConversationSourceId(methodCall: FlutterMethodCall)->String { - let result: String = getParamValue(methodCall: methodCall, param: KEY_CONVERSATION_SOURCE_ID); + let result: String = getParamValue(methodCall: methodCall, param: KEY_CONVERSATION_SOURCE_ID) as! String; return result } @@ -273,7 +278,7 @@ public class CommonUtil { private static let KEY_TEXT: String = "text"; private static let KEY_AT_USER_LIST: String = "atUserList"; private static let KEY_IMAGE_PATH: String = "imagePath"; - private static let KEY_SOUND_PATH: String= "soundPath"; + private static let KEY_SOUND_PATH: String = "soundPath"; private static let KEY_SOUND_DURATION: String = "duration"; private static let KEY_VIDEO_PATH: String = "videoPath"; private static let KEY_VIDEO_TYPE: String = "videoType"; diff --git a/ios/Classes/Module/GroupManager.swift b/ios/Classes/Module/GroupManager.swift index 2a82fd5..35768df 100644 --- a/ios/Classes/Module/GroupManager.swift +++ b/ios/Classes/Module/GroupManager.swift @@ -75,60 +75,70 @@ public class GroupManager:NSObject{ Open_im_sdkRefuseGroupApplication(CommonUtil.getGroupApplicationInfo(methodCall: methodCall), CommonUtil.getGroupOpReason(methodCall: methodCall), BaseImpl(result: result)) } - func forceSyncApplyGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncApplyGroupRequest() - } - - func forceSyncGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncGroupRequest() - } - - func forceSyncJoinedGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncJoinedGroup() - } - - func forceSyncJoinedGroupMember(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncJoinedGroupMember() - } +// func forceSyncApplyGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncApplyGroupRequest() +// } +// +// func forceSyncGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncGroupRequest() +// } +// +// func forceSyncJoinedGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncJoinedGroup() +// } +// +// func forceSyncJoinedGroupMember(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncJoinedGroupMember() +// } } public class GroupListener:NSObject,Open_im_sdkOnGroupListenerProtocol { + private let channel:FlutterMethodChannel init(channel:FlutterMethodChannel) { self.channel = channel } - public func onApplicationProcessed(_ s: String?,s1: String?,i: Int?,s2: String?) { + public func onApplicationProcessed(_ groupId: String?, opUser: String?, agreeOrReject AgreeOrReject: Int32, opReason: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) - values.setValue(s, forKey: "groupId") - values.setValue(s1, forKey: "opUser") - values.setValue(i, forKey: "agreeOrReject") - values.setValue(s2, forKey: "opReason") + values.setValue(groupId, forKey: "groupId") + values.setValue(opUser, forKey: "opUser") + values.setValue(AgreeOrReject, forKey: "agreeOrReject") + values.setValue(opReason, forKey: "opReason") CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onApplicationProcessed", errCode: nil, errMsg: nil, data: values) } +// public func onApplicationProcessed(_ s: String?,s1: String?,i: Int?,s2: String?) { +// let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) +// values.setValue(s, forKey: "groupId") +// values.setValue(s1, forKey: "opUser") +// values.setValue(i, forKey: "agreeOrReject") +// values.setValue(s2, forKey: "opReason") +// CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onApplicationProcessed", errCode: nil, errMsg: nil, data: values) +// } + public func onGroupCreated(_ s: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupCreated", errCode: nil, errMsg: nil, data: values) } - public func onGroupInfoChanged(_ s: String?,s1: String?) { + public func onGroupInfoChanged(_ s: String?,groupInfo s1: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") values.setValue(s1, forKey: "groupInfo") CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onGroupInfoChanged", errCode: nil, errMsg: nil, data: values) } - public func onMemberEnter(_ s: String?,s1: String?) { + public func onMemberEnter(_ s: String?,memberList s1: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") values.setValue(s1, forKey: "memberList") CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onMemberEnter", errCode: nil, errMsg: nil, data: values) } - public func onMemberInvited(_ s: String?,s1: String?,s2: String?) { + public func onMemberInvited(_ s: String?,opUser s1: String?,memberList s2: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") values.setValue(s1, forKey: "opUser") @@ -136,7 +146,7 @@ public class GroupListener:NSObject,Open_im_sdkOnGroupListenerProtocol { CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onMemberInvited", errCode: nil, errMsg: nil, data: values) } - public func onMemberKicked(_ s: String?,s1: String?,s2: String?) { + public func onMemberKicked(_ s: String?,opUser s1: String?,memberList s2: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") values.setValue(s1, forKey: "opUser") @@ -144,14 +154,14 @@ public class GroupListener:NSObject,Open_im_sdkOnGroupListenerProtocol { CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onMemberKicked", errCode: nil, errMsg: nil, data: values) } - public func onMemberLeave(_ s: String?,s1: String?) { + public func onMemberLeave(_ s: String?,member s1: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") values.setValue(s1, forKey: "member") CommonUtil.emitEvent(channel: channel, method: "groupListener", type: "onMemberLeave", errCode: nil, errMsg: nil, data: values) } - public func onReceiveJoinApplication(_ s: String?,s1: String?,s2: String?) { + public func onReceiveJoinApplication(_ s: String?,member s1: String?,opReason s2: String?) { let values: NSMutableDictionary = NSMutableDictionary(capacity: 0) values.setValue(s, forKey: "groupId") values.setValue(s1, forKey: "member") diff --git a/ios/Classes/Module/IMManager.swift b/ios/Classes/Module/IMManager.swift index 0754d43..bcd7c37 100644 --- a/ios/Classes/Module/IMManager.swift +++ b/ios/Classes/Module/IMManager.swift @@ -33,7 +33,7 @@ public class IMMananger:NSObject{ } func getLoginUid(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - DispatchQueue.main.async { result(Open_im_sdkGetLoginUid()) } + DispatchQueue.main.async { result(Open_im_sdkGetLoginUser()) } } func getUsersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { diff --git a/ios/Classes/Module/MessageManager.swift b/ios/Classes/Module/MessageManager.swift index 57003cd..d1f7852 100644 --- a/ios/Classes/Module/MessageManager.swift +++ b/ios/Classes/Module/MessageManager.swift @@ -42,11 +42,11 @@ public class MessageManager:NSObject{ } func sendMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - let sendMsgProgressListener: SendMsgProgressListener= SendMsgProgressListener(channel: channel) - sendMsgProgressListener?.setCall(methodCall: methodCall) - sendMsgProgressListener?.setResult(result: result) + let sendMsgProgressListener: SendMsgProgressListener = SendMsgProgressListener(channel: channel) + sendMsgProgressListener.setCall(methodCall: methodCall) + sendMsgProgressListener.setResult(result: result) print("===============sendMessage===============") - Open_im_sdkSendMessage(sendMsgProgressListener, CommonUtil.getSendMessageContent(methodCall: methodCall), CommonUtil.getSendMessageReceiver(methodCall: methodCall), CommonUtil.geSendMessageGroupId(methodCall: methodCall), CommonUtil.getSendMessageOnlineOnly(methodCall: methodCall)) + Open_im_sdkSendMessage(sendMsgProgressListener, CommonUtil.getSendMessageContent(methodCall: methodCall), CommonUtil.getSendMessageReceiver(methodCall: methodCall), CommonUtil.getSendMessageGroupId(methodCall: methodCall), CommonUtil.getSendMessageOnlineOnly(methodCall: methodCall)) } func getHistoryMessageList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -193,3 +193,4 @@ public class AdvancedMsgListener: NSObject, Open_im_sdkOnAdvancedMsgListenerProt } +} diff --git a/ios/Classes/SwiftFlutterOpenimSdkPlugin.swift b/ios/Classes/SwiftFlutterOpenimSdkPlugin.swift index 4a03b24..f70bdfa 100644 --- a/ios/Classes/SwiftFlutterOpenimSdkPlugin.swift +++ b/ios/Classes/SwiftFlutterOpenimSdkPlugin.swift @@ -58,7 +58,7 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin { imManager.setSelfInfo(methodCall: call, result: result) }else if method == "forceSyncLoginUerInfo" { imManager.forceSyncLoginUerInfo(methodCall: call, result: result) - }}else if method == "forceReConn" { + }else if method == "forceReConn" { imManager.forceReConn(methodCall: call, result: result) }else{ print("Handle MethodName Error: IMManager method: \(method) not found") @@ -164,7 +164,7 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin { }else if method == "createForwardMessage" { messageManager.createForwardMessage(methodCall: call, result: result) }else if method == "getTotalUnreadMsgCount" { - conversationManager.getTotalUnreadMsgCount(methodCall: call, result: result) + messageManager.getTotalUnreadMsgCount(methodCall: call, result: result) }else{ print("Handle MethodName Error: MessageManager method: \(method) not found") } @@ -202,14 +202,14 @@ public class SwiftFlutterOpenimSdkPlugin: NSObject, FlutterPlugin { groupManager.acceptGroupApplication(methodCall: call, result: result) }else if method == "refuseGroupApplication" { groupManager.refuseGroupApplication(methodCall: call, result: result) - }else if method == "forceSyncApplyGroupRequest" { - groupManager.forceSyncApplyGroupRequest(methodCall: call, result: result) - }else if method == "forceSyncGroupRequest" { - groupManager.forceSyncGroupRequest(methodCall: call, result: result) - }else if method == "forceSyncJoinedGroup" { - groupManager.forceSyncJoinedGroup(methodCall: call, result: result) - }else if method == "forceSyncJoinedGroupMember" { - groupManager.forceSyncJoinedGroupMember(methodCall: call, result: result) +// }else if method == "forceSyncApplyGroupRequest" { +// groupManager.forceSyncApplyGroupRequest(methodCall: call, result: result) +// }else if method == "forceSyncGroupRequest" { +// groupManager.forceSyncGroupRequest(methodCall: call, result: result) +// }else if method == "forceSyncJoinedGroup" { +// groupManager.forceSyncJoinedGroup(methodCall: call, result: result) +// }else if method == "forceSyncJoinedGroupMember" { +// groupManager.forceSyncJoinedGroupMember(methodCall: call, result: result) }else{ print("Handle MethodName Error: MessageManager method: \(method) not found") } diff --git a/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h b/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h index 84cc504..409eb64 100644 --- a/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h +++ b/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h @@ -17,17 +17,17 @@ @class Open_im_sdkConversationListener; @class Open_im_sdkConversationStruct; @class Open_im_sdkFriend; +@class Open_im_sdkGroupApplicationInfo; @class Open_im_sdkGroupApplicationResponseReq; @class Open_im_sdkGroupReqListInfo; @class Open_im_sdkIMConfig; @class Open_im_sdkIMManager; -@class Open_im_sdkInviteUserToGroupReq; -@class Open_im_sdkKickGroupMemberReq; @class Open_im_sdkLogInfo; @class Open_im_sdkMessageReceipt; @class Open_im_sdkMsg; @class Open_im_sdkMsgData; @class Open_im_sdkMsgStruct; +@class Open_im_sdkNotificationContent; @class Open_im_sdkPictureBaseInfo; @class Open_im_sdkPullMsgReq; @class Open_im_sdkPullUserMsgResp; @@ -130,7 +130,9 @@ - (nonnull instancetype)initWithRef:(_Nonnull id)ref; - (nonnull instancetype)init; -// skipped field ArrMsg.Data with unsupported type: []open_im_sdk/open_im_sdk.MsgData +// skipped field ArrMsg.SingleData with unsupported type: []open_im_sdk/open_im_sdk.MsgData + +// skipped field ArrMsg.GroupData with unsupported type: []open_im_sdk/open_im_sdk.MsgData @end @@ -197,6 +199,19 @@ - (nonnull instancetype)init; @end +@interface Open_im_sdkGroupApplicationInfo : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +// skipped field GroupApplicationInfo.Info with unsupported type: open_im_sdk/open_im_sdk.accessOrRefuseGroupApplicationReq + +@property (nonatomic) NSString* _Nonnull handUserID; +@property (nonatomic) NSString* _Nonnull handUserName; +@property (nonatomic) NSString* _Nonnull handUserIcon; +@end + @interface Open_im_sdkGroupApplicationResponseReq : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -242,7 +257,9 @@ @property (nonatomic) int32_t type; @property (nonatomic) int32_t handleStatus; @property (nonatomic) int32_t handleResult; -@property (nonatomic) int32_t isRead; +- (NSString* _Nonnull)key; +// skipped method GroupReqListInfo.Value with unsupported parameter or return types + @end @interface Open_im_sdkIMConfig : NSObject { @@ -266,32 +283,6 @@ @property (nonatomic) long loginState; @end -@interface Open_im_sdkInviteUserToGroupReq : NSObject { -} -@property(strong, readonly) _Nonnull id _ref; - -- (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (nonnull instancetype)init; -@property (nonatomic) NSString* _Nonnull op; -@property (nonatomic) NSString* _Nonnull groupID; -@property (nonatomic) NSString* _Nonnull reason; -// skipped field InviteUserToGroupReq.UidList with unsupported type: []string - -@end - -@interface Open_im_sdkKickGroupMemberReq : NSObject { -} -@property(strong, readonly) _Nonnull id _ref; - -- (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (nonnull instancetype)init; -@property (nonatomic) NSString* _Nonnull op; -@property (nonatomic) NSString* _Nonnull groupID; -@property (nonatomic) NSString* _Nonnull reason; -// skipped field KickGroupMemberReq.UidList with unsupported type: []string - -@end - @interface Open_im_sdkLogInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -386,10 +377,27 @@ // skipped field MsgStruct.MergeElem with unsupported type: struct{Title string "json:\"title\""; AbstractList []string "json:\"abstractList\""; MultiMessage []*open_im_sdk/open_im_sdk.MsgStruct "json:\"multiMessage\""} -// skipped field MsgStruct.RevokeMessage with unsupported type: struct{ServerMsgID string "json:\"serverMsgID\""; SendID string "json:\"sendID\""; SenderNickname string "json:\"senderNickname\""; RecvID string "json:\"recvID\""; GroupID string "json:\"groupID\""; ContentType int32 "json:\"contentType\""; SendTime int64 "json:\"sendTime\""} +// skipped field MsgStruct.AtElem with unsupported type: struct{Text string "json:\"text\""; AtUserList []string "json:\"atUserList\""; IsAtSelf bool "json:\"isAtSelf\""} + +// skipped field MsgStruct.LocationElem with unsupported type: struct{Description string "json:\"description\""; Longitude float64 "json:\"longitude\""; Latitude float64 "json:\"latitude\""} + +// skipped field MsgStruct.CustomElem with unsupported type: struct{Data string "json:\"data\""; Description string "json:\"description\""; Extension string "json:\"extension\""} + +// skipped field MsgStruct.QuoteElem with unsupported type: struct{Text string "json:\"text\""; QuoteMessage *open_im_sdk/open_im_sdk.MsgStruct "json:\"quoteMessage\""} @end +@interface Open_im_sdkNotificationContent : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int32_t isDisplay; +@property (nonatomic) NSString* _Nonnull defaultTips; +@property (nonatomic) NSString* _Nonnull detail; +@end + @interface Open_im_sdkPictureBaseInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -482,12 +490,12 @@ @end FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptFriendApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationResultTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationTip; +FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkAcceptGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAddConOrUpLatMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkAddFriendTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAtText; -FOUNDATION_EXPORT const int64_t Open_im_sdkC2CMessageAsRead; +FOUNDATION_EXPORT const int64_t Open_im_sdkCard; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdAcceptFriend; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdAddFriend; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdBlackList; @@ -508,6 +516,7 @@ FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdUpdateConversation; FOUNDATION_EXPORT const int64_t Open_im_sdkConAndUnreadChange; FOUNDATION_EXPORT const int64_t Open_im_sdkConChange; FOUNDATION_EXPORT const int64_t Open_im_sdkCreateGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkCustom; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkDeFaultSuccessMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkErrCodeConversation; FOUNDATION_EXPORT const int64_t Open_im_sdkErrCodeFriend; @@ -525,14 +534,20 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionQuitGroup; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionRefuseGroupApplication; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionSetGroupInfo; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionTransferGroupOwner; -FOUNDATION_EXPORT const int64_t Open_im_sdkGroupApplicationResponseTip; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupChatType; +/** + * /////////////////////////////////////// + */ +FOUNDATION_EXPORT const int64_t Open_im_sdkGroupTipBegin; +FOUNDATION_EXPORT const int64_t Open_im_sdkGroupTipEnd; FOUNDATION_EXPORT const int64_t Open_im_sdkHasRead; +FOUNDATION_EXPORT const int64_t Open_im_sdkHasReadReceipt; FOUNDATION_EXPORT const int64_t Open_im_sdkIncrUnread; FOUNDATION_EXPORT const int64_t Open_im_sdkInviteUserToGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkJoinGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkKickGroupMemberTip; FOUNDATION_EXPORT const int64_t Open_im_sdkKickOnlineTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkLocation; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginSuccess; FOUNDATION_EXPORT const int64_t Open_im_sdkLogining; @@ -541,6 +556,7 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkMerger; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusHasDeleted; +FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusRevoked; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSendFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSendSuccess; /** @@ -550,10 +566,10 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSending; FOUNDATION_EXPORT const int64_t Open_im_sdkNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkPicture; FOUNDATION_EXPORT const int64_t Open_im_sdkQuitGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkQuote; FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseFriendApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseGroupApplicationResultTip; FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseGroupApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkRevokeMessageTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkRevoke; FOUNDATION_EXPORT const int64_t Open_im_sdkSetGroupInfoTip; FOUNDATION_EXPORT const int64_t Open_im_sdkSetSelfInfoTip; /** @@ -561,8 +577,12 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkSetSelfInfoTip; SessionType */ FOUNDATION_EXPORT const int64_t Open_im_sdkSingleChatType; +/** + * //////////////////////////////////////// + */ +FOUNDATION_EXPORT const int64_t Open_im_sdkSingleTipBegin; +FOUNDATION_EXPORT const int64_t Open_im_sdkSingleTipEnd; FOUNDATION_EXPORT const int64_t Open_im_sdkSound; -FOUNDATION_EXPORT const int64_t Open_im_sdkSyncSenderMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkSysMsgType; /** * ContentType @@ -571,6 +591,8 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkText; FOUNDATION_EXPORT const int64_t Open_im_sdkTimeOffset; FOUNDATION_EXPORT const int64_t Open_im_sdkTotalUnreadMessageChanged; FOUNDATION_EXPORT const int64_t Open_im_sdkTransferGroupOwnerTip; +FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkTransferGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkTyping; FOUNDATION_EXPORT const int64_t Open_im_sdkUnreadCountSetZero; FOUNDATION_EXPORT const int64_t Open_im_sdkUpdateFaceUrlAndNickName; /** @@ -609,6 +631,10 @@ FOUNDATION_EXPORT void Open_im_sdkAddToBlackList(id _Nullable c FOUNDATION_EXPORT void Open_im_sdkCheckFriend(id _Nullable callback, NSString* _Nullable uidList); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCardMessage(NSString* _Nullable cardInfo); + +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCustomMessage(NSString* _Nullable data, NSString* _Nullable extension, NSString* _Nullable description); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateFileMessage(NSString* _Nullable filePath, NSString* _Nullable fileName); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateForwardMessage(NSString* _Nullable m); @@ -619,16 +645,20 @@ FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateImageMessage(NSString* _Nu FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateImageMessageFromFullPath(NSString* _Nullable imageFullPath); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateLocationMessage(NSString* _Nullable description, double longitude, double latitude); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateMergerMessage(NSString* _Nullable messageList, NSString* _Nullable title, NSString* _Nullable summaryList); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateQuoteMessage(NSString* _Nullable text, NSString* _Nullable message); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateSoundMessage(NSString* _Nullable soundPath, int64_t duration); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateSoundMessageFromFullPath(NSString* _Nullable soundPath, int64_t duration); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextAtMessage(NSString* _Nullable text, NSString* _Nullable atUserList); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextMessage(NSString* _Nullable text); -FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextSystemMessage(NSString* _Nullable text, int32_t textType); - FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateVideoMessage(NSString* _Nullable videoPath, NSString* _Nullable videoType, int64_t duration, NSString* _Nullable snapshotPath); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateVideoMessageFromFullPath(NSString* _Nullable videoFullPath, NSString* _Nullable videoType, int64_t duration, NSString* _Nullable snapshotFullPath); @@ -641,27 +671,11 @@ FOUNDATION_EXPORT void Open_im_sdkDeleteFromFriendList(NSString* _Nullable delet FOUNDATION_EXPORT void Open_im_sdkDeleteMessageFromLocalStorage(id _Nullable callback, NSString* _Nullable message); -FOUNDATION_EXPORT void Open_im_sdkDoCreateGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoGetGroupsInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDoJoinGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoQuitGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoSetGroupInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetGroupMemberList(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetGroupMembersInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetJoinedGroupList(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestKickGroupMember(void); +FOUNDATION_EXPORT void Open_im_sdkFindMessages(id _Nullable callback, NSString* _Nullable messageIDList); -FOUNDATION_EXPORT void Open_im_sdkDotesttestInviteUserToGroup(void); +FOUNDATION_EXPORT void Open_im_sdkForceReConn(void); -FOUNDATION_EXPORT void Open_im_sdkFindMessages(id _Nullable callback, NSString* _Nullable messageIDList); +FOUNDATION_EXPORT void Open_im_sdkForceSyncApplyGroupRequest(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncBlackList(void); @@ -669,18 +683,27 @@ FOUNDATION_EXPORT void Open_im_sdkForceSyncFriend(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncFriendApplication(void); +FOUNDATION_EXPORT void Open_im_sdkForceSyncGroupRequest(void); + +FOUNDATION_EXPORT void Open_im_sdkForceSyncJoinedGroup(void); + +FOUNDATION_EXPORT void Open_im_sdkForceSyncJoinedGroupMember(void); + FOUNDATION_EXPORT void Open_im_sdkForceSyncLoginUerInfo(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncMsg(void); -FOUNDATION_EXPORT void Open_im_sdkFriendApplication(id _Nullable callback, NSString* _Nullable uid, long flag); - FOUNDATION_EXPORT void Open_im_sdkGetAllConversationList(id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkGetBlackList(id _Nullable callback); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkGetConversationIDBySessionType(NSString* _Nullable sourceID, long sessionType); +/** + * Get the current timestamp by Mill + */ +FOUNDATION_EXPORT int64_t Open_im_sdkGetCurrentTimestampByMill(void); + FOUNDATION_EXPORT void Open_im_sdkGetFriendApplicationList(id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkGetFriendList(id _Nullable callback); @@ -719,13 +742,15 @@ FOUNDATION_EXPORT void Open_im_sdkInviteUserToGroup(NSString* _Nullable groupId, FOUNDATION_EXPORT void Open_im_sdkJoinGroup(NSString* _Nullable groupId, NSString* _Nullable message, id _Nullable callback); -FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable userList, NSString* _Nullable reason, id _Nullable callback); +FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable reason, NSString* _Nullable userList, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogin(NSString* _Nullable uid, NSString* _Nullable tk, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogout(id _Nullable callback); -FOUNDATION_EXPORT void Open_im_sdkMarkC2CMessageAsRead(id _Nullable callback, NSString* _Nullable receiver, NSString* _Nullable msgList); +FOUNDATION_EXPORT void Open_im_sdkMarkC2CMessageAsRead(id _Nullable callback, NSString* _Nullable receiver, NSString* _Nullable msgIDList); + +FOUNDATION_EXPORT void Open_im_sdkMarkGroupMessageHasRead(id _Nullable callback, NSString* _Nullable groupID); FOUNDATION_EXPORT void Open_im_sdkMarkSingleMessageHasRead(id _Nullable callback, NSString* _Nullable userID); @@ -765,6 +790,10 @@ FOUNDATION_EXPORT void Open_im_sdkTencentOssCredentials(id _Nul FOUNDATION_EXPORT void Open_im_sdkTransferGroupOwner(NSString* _Nullable groupId, NSString* _Nullable userId, id _Nullable callback); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkTsetGetGroupApplicationList(id _Nullable callback); + +FOUNDATION_EXPORT void Open_im_sdkTypingStatusUpdate(NSString* _Nullable receiver, NSString* _Nullable msgTip); + FOUNDATION_EXPORT void Open_im_sdkUnInitSDK(void); // skipped function UnixSecondToTime with unsupported parameter or return types @@ -853,18 +882,9 @@ FOUNDATION_EXPORT void Open_im_sdkUnInitSDK(void); - (void)onApplicationProcessed:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser AgreeOrReject:(int32_t)AgreeOrReject opReason:(NSString* _Nullable)opReason; - (void)onGroupCreated:(NSString* _Nullable)groupId; - (void)onGroupInfoChanged:(NSString* _Nullable)groupId groupInfo:(NSString* _Nullable)groupInfo; -/** - * list->group - */ - (void)onMemberEnter:(NSString* _Nullable)groupId memberList:(NSString* _Nullable)memberList; -/** - * list->opUser->groupId - */ - (void)onMemberInvited:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser memberList:(NSString* _Nullable)memberList; - (void)onMemberKicked:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser memberList:(NSString* _Nullable)memberList; -/** - * group->one - */ - (void)onMemberLeave:(NSString* _Nullable)groupId member:(NSString* _Nullable)member; - (void)onReceiveJoinApplication:(NSString* _Nullable)groupId member:(NSString* _Nullable)member opReason:(NSString* _Nullable)opReason; @end diff --git a/ios/Framework/OpenIMCore.framework/OpenIMCore b/ios/Framework/OpenIMCore.framework/OpenIMCore index 58ede0b..e84581b 100644 Binary files a/ios/Framework/OpenIMCore.framework/OpenIMCore and b/ios/Framework/OpenIMCore.framework/OpenIMCore differ diff --git a/ios/Framework/OpenIMCore.framework/Versions/A/Headers/Open_im_sdk.objc.h b/ios/Framework/OpenIMCore.framework/Versions/A/Headers/Open_im_sdk.objc.h index 84cc504..409eb64 100644 --- a/ios/Framework/OpenIMCore.framework/Versions/A/Headers/Open_im_sdk.objc.h +++ b/ios/Framework/OpenIMCore.framework/Versions/A/Headers/Open_im_sdk.objc.h @@ -17,17 +17,17 @@ @class Open_im_sdkConversationListener; @class Open_im_sdkConversationStruct; @class Open_im_sdkFriend; +@class Open_im_sdkGroupApplicationInfo; @class Open_im_sdkGroupApplicationResponseReq; @class Open_im_sdkGroupReqListInfo; @class Open_im_sdkIMConfig; @class Open_im_sdkIMManager; -@class Open_im_sdkInviteUserToGroupReq; -@class Open_im_sdkKickGroupMemberReq; @class Open_im_sdkLogInfo; @class Open_im_sdkMessageReceipt; @class Open_im_sdkMsg; @class Open_im_sdkMsgData; @class Open_im_sdkMsgStruct; +@class Open_im_sdkNotificationContent; @class Open_im_sdkPictureBaseInfo; @class Open_im_sdkPullMsgReq; @class Open_im_sdkPullUserMsgResp; @@ -130,7 +130,9 @@ - (nonnull instancetype)initWithRef:(_Nonnull id)ref; - (nonnull instancetype)init; -// skipped field ArrMsg.Data with unsupported type: []open_im_sdk/open_im_sdk.MsgData +// skipped field ArrMsg.SingleData with unsupported type: []open_im_sdk/open_im_sdk.MsgData + +// skipped field ArrMsg.GroupData with unsupported type: []open_im_sdk/open_im_sdk.MsgData @end @@ -197,6 +199,19 @@ - (nonnull instancetype)init; @end +@interface Open_im_sdkGroupApplicationInfo : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +// skipped field GroupApplicationInfo.Info with unsupported type: open_im_sdk/open_im_sdk.accessOrRefuseGroupApplicationReq + +@property (nonatomic) NSString* _Nonnull handUserID; +@property (nonatomic) NSString* _Nonnull handUserName; +@property (nonatomic) NSString* _Nonnull handUserIcon; +@end + @interface Open_im_sdkGroupApplicationResponseReq : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -242,7 +257,9 @@ @property (nonatomic) int32_t type; @property (nonatomic) int32_t handleStatus; @property (nonatomic) int32_t handleResult; -@property (nonatomic) int32_t isRead; +- (NSString* _Nonnull)key; +// skipped method GroupReqListInfo.Value with unsupported parameter or return types + @end @interface Open_im_sdkIMConfig : NSObject { @@ -266,32 +283,6 @@ @property (nonatomic) long loginState; @end -@interface Open_im_sdkInviteUserToGroupReq : NSObject { -} -@property(strong, readonly) _Nonnull id _ref; - -- (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (nonnull instancetype)init; -@property (nonatomic) NSString* _Nonnull op; -@property (nonatomic) NSString* _Nonnull groupID; -@property (nonatomic) NSString* _Nonnull reason; -// skipped field InviteUserToGroupReq.UidList with unsupported type: []string - -@end - -@interface Open_im_sdkKickGroupMemberReq : NSObject { -} -@property(strong, readonly) _Nonnull id _ref; - -- (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (nonnull instancetype)init; -@property (nonatomic) NSString* _Nonnull op; -@property (nonatomic) NSString* _Nonnull groupID; -@property (nonatomic) NSString* _Nonnull reason; -// skipped field KickGroupMemberReq.UidList with unsupported type: []string - -@end - @interface Open_im_sdkLogInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -386,10 +377,27 @@ // skipped field MsgStruct.MergeElem with unsupported type: struct{Title string "json:\"title\""; AbstractList []string "json:\"abstractList\""; MultiMessage []*open_im_sdk/open_im_sdk.MsgStruct "json:\"multiMessage\""} -// skipped field MsgStruct.RevokeMessage with unsupported type: struct{ServerMsgID string "json:\"serverMsgID\""; SendID string "json:\"sendID\""; SenderNickname string "json:\"senderNickname\""; RecvID string "json:\"recvID\""; GroupID string "json:\"groupID\""; ContentType int32 "json:\"contentType\""; SendTime int64 "json:\"sendTime\""} +// skipped field MsgStruct.AtElem with unsupported type: struct{Text string "json:\"text\""; AtUserList []string "json:\"atUserList\""; IsAtSelf bool "json:\"isAtSelf\""} + +// skipped field MsgStruct.LocationElem with unsupported type: struct{Description string "json:\"description\""; Longitude float64 "json:\"longitude\""; Latitude float64 "json:\"latitude\""} + +// skipped field MsgStruct.CustomElem with unsupported type: struct{Data string "json:\"data\""; Description string "json:\"description\""; Extension string "json:\"extension\""} + +// skipped field MsgStruct.QuoteElem with unsupported type: struct{Text string "json:\"text\""; QuoteMessage *open_im_sdk/open_im_sdk.MsgStruct "json:\"quoteMessage\""} @end +@interface Open_im_sdkNotificationContent : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int32_t isDisplay; +@property (nonatomic) NSString* _Nonnull defaultTips; +@property (nonatomic) NSString* _Nonnull detail; +@end + @interface Open_im_sdkPictureBaseInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -482,12 +490,12 @@ @end FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptFriendApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationResultTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationTip; +FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkAcceptGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAddConOrUpLatMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkAddFriendTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAtText; -FOUNDATION_EXPORT const int64_t Open_im_sdkC2CMessageAsRead; +FOUNDATION_EXPORT const int64_t Open_im_sdkCard; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdAcceptFriend; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdAddFriend; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdBlackList; @@ -508,6 +516,7 @@ FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdUpdateConversation; FOUNDATION_EXPORT const int64_t Open_im_sdkConAndUnreadChange; FOUNDATION_EXPORT const int64_t Open_im_sdkConChange; FOUNDATION_EXPORT const int64_t Open_im_sdkCreateGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkCustom; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkDeFaultSuccessMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkErrCodeConversation; FOUNDATION_EXPORT const int64_t Open_im_sdkErrCodeFriend; @@ -525,14 +534,20 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionQuitGroup; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionRefuseGroupApplication; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionSetGroupInfo; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionTransferGroupOwner; -FOUNDATION_EXPORT const int64_t Open_im_sdkGroupApplicationResponseTip; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupChatType; +/** + * /////////////////////////////////////// + */ +FOUNDATION_EXPORT const int64_t Open_im_sdkGroupTipBegin; +FOUNDATION_EXPORT const int64_t Open_im_sdkGroupTipEnd; FOUNDATION_EXPORT const int64_t Open_im_sdkHasRead; +FOUNDATION_EXPORT const int64_t Open_im_sdkHasReadReceipt; FOUNDATION_EXPORT const int64_t Open_im_sdkIncrUnread; FOUNDATION_EXPORT const int64_t Open_im_sdkInviteUserToGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkJoinGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkKickGroupMemberTip; FOUNDATION_EXPORT const int64_t Open_im_sdkKickOnlineTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkLocation; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginSuccess; FOUNDATION_EXPORT const int64_t Open_im_sdkLogining; @@ -541,6 +556,7 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkMerger; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusHasDeleted; +FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusRevoked; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSendFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSendSuccess; /** @@ -550,10 +566,10 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSending; FOUNDATION_EXPORT const int64_t Open_im_sdkNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkPicture; FOUNDATION_EXPORT const int64_t Open_im_sdkQuitGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkQuote; FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseFriendApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseGroupApplicationResultTip; FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseGroupApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkRevokeMessageTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkRevoke; FOUNDATION_EXPORT const int64_t Open_im_sdkSetGroupInfoTip; FOUNDATION_EXPORT const int64_t Open_im_sdkSetSelfInfoTip; /** @@ -561,8 +577,12 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkSetSelfInfoTip; SessionType */ FOUNDATION_EXPORT const int64_t Open_im_sdkSingleChatType; +/** + * //////////////////////////////////////// + */ +FOUNDATION_EXPORT const int64_t Open_im_sdkSingleTipBegin; +FOUNDATION_EXPORT const int64_t Open_im_sdkSingleTipEnd; FOUNDATION_EXPORT const int64_t Open_im_sdkSound; -FOUNDATION_EXPORT const int64_t Open_im_sdkSyncSenderMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkSysMsgType; /** * ContentType @@ -571,6 +591,8 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkText; FOUNDATION_EXPORT const int64_t Open_im_sdkTimeOffset; FOUNDATION_EXPORT const int64_t Open_im_sdkTotalUnreadMessageChanged; FOUNDATION_EXPORT const int64_t Open_im_sdkTransferGroupOwnerTip; +FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkTransferGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkTyping; FOUNDATION_EXPORT const int64_t Open_im_sdkUnreadCountSetZero; FOUNDATION_EXPORT const int64_t Open_im_sdkUpdateFaceUrlAndNickName; /** @@ -609,6 +631,10 @@ FOUNDATION_EXPORT void Open_im_sdkAddToBlackList(id _Nullable c FOUNDATION_EXPORT void Open_im_sdkCheckFriend(id _Nullable callback, NSString* _Nullable uidList); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCardMessage(NSString* _Nullable cardInfo); + +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCustomMessage(NSString* _Nullable data, NSString* _Nullable extension, NSString* _Nullable description); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateFileMessage(NSString* _Nullable filePath, NSString* _Nullable fileName); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateForwardMessage(NSString* _Nullable m); @@ -619,16 +645,20 @@ FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateImageMessage(NSString* _Nu FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateImageMessageFromFullPath(NSString* _Nullable imageFullPath); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateLocationMessage(NSString* _Nullable description, double longitude, double latitude); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateMergerMessage(NSString* _Nullable messageList, NSString* _Nullable title, NSString* _Nullable summaryList); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateQuoteMessage(NSString* _Nullable text, NSString* _Nullable message); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateSoundMessage(NSString* _Nullable soundPath, int64_t duration); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateSoundMessageFromFullPath(NSString* _Nullable soundPath, int64_t duration); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextAtMessage(NSString* _Nullable text, NSString* _Nullable atUserList); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextMessage(NSString* _Nullable text); -FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextSystemMessage(NSString* _Nullable text, int32_t textType); - FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateVideoMessage(NSString* _Nullable videoPath, NSString* _Nullable videoType, int64_t duration, NSString* _Nullable snapshotPath); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateVideoMessageFromFullPath(NSString* _Nullable videoFullPath, NSString* _Nullable videoType, int64_t duration, NSString* _Nullable snapshotFullPath); @@ -641,27 +671,11 @@ FOUNDATION_EXPORT void Open_im_sdkDeleteFromFriendList(NSString* _Nullable delet FOUNDATION_EXPORT void Open_im_sdkDeleteMessageFromLocalStorage(id _Nullable callback, NSString* _Nullable message); -FOUNDATION_EXPORT void Open_im_sdkDoCreateGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoGetGroupsInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDoJoinGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoQuitGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoSetGroupInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetGroupMemberList(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetGroupMembersInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetJoinedGroupList(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestKickGroupMember(void); +FOUNDATION_EXPORT void Open_im_sdkFindMessages(id _Nullable callback, NSString* _Nullable messageIDList); -FOUNDATION_EXPORT void Open_im_sdkDotesttestInviteUserToGroup(void); +FOUNDATION_EXPORT void Open_im_sdkForceReConn(void); -FOUNDATION_EXPORT void Open_im_sdkFindMessages(id _Nullable callback, NSString* _Nullable messageIDList); +FOUNDATION_EXPORT void Open_im_sdkForceSyncApplyGroupRequest(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncBlackList(void); @@ -669,18 +683,27 @@ FOUNDATION_EXPORT void Open_im_sdkForceSyncFriend(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncFriendApplication(void); +FOUNDATION_EXPORT void Open_im_sdkForceSyncGroupRequest(void); + +FOUNDATION_EXPORT void Open_im_sdkForceSyncJoinedGroup(void); + +FOUNDATION_EXPORT void Open_im_sdkForceSyncJoinedGroupMember(void); + FOUNDATION_EXPORT void Open_im_sdkForceSyncLoginUerInfo(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncMsg(void); -FOUNDATION_EXPORT void Open_im_sdkFriendApplication(id _Nullable callback, NSString* _Nullable uid, long flag); - FOUNDATION_EXPORT void Open_im_sdkGetAllConversationList(id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkGetBlackList(id _Nullable callback); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkGetConversationIDBySessionType(NSString* _Nullable sourceID, long sessionType); +/** + * Get the current timestamp by Mill + */ +FOUNDATION_EXPORT int64_t Open_im_sdkGetCurrentTimestampByMill(void); + FOUNDATION_EXPORT void Open_im_sdkGetFriendApplicationList(id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkGetFriendList(id _Nullable callback); @@ -719,13 +742,15 @@ FOUNDATION_EXPORT void Open_im_sdkInviteUserToGroup(NSString* _Nullable groupId, FOUNDATION_EXPORT void Open_im_sdkJoinGroup(NSString* _Nullable groupId, NSString* _Nullable message, id _Nullable callback); -FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable userList, NSString* _Nullable reason, id _Nullable callback); +FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable reason, NSString* _Nullable userList, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogin(NSString* _Nullable uid, NSString* _Nullable tk, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogout(id _Nullable callback); -FOUNDATION_EXPORT void Open_im_sdkMarkC2CMessageAsRead(id _Nullable callback, NSString* _Nullable receiver, NSString* _Nullable msgList); +FOUNDATION_EXPORT void Open_im_sdkMarkC2CMessageAsRead(id _Nullable callback, NSString* _Nullable receiver, NSString* _Nullable msgIDList); + +FOUNDATION_EXPORT void Open_im_sdkMarkGroupMessageHasRead(id _Nullable callback, NSString* _Nullable groupID); FOUNDATION_EXPORT void Open_im_sdkMarkSingleMessageHasRead(id _Nullable callback, NSString* _Nullable userID); @@ -765,6 +790,10 @@ FOUNDATION_EXPORT void Open_im_sdkTencentOssCredentials(id _Nul FOUNDATION_EXPORT void Open_im_sdkTransferGroupOwner(NSString* _Nullable groupId, NSString* _Nullable userId, id _Nullable callback); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkTsetGetGroupApplicationList(id _Nullable callback); + +FOUNDATION_EXPORT void Open_im_sdkTypingStatusUpdate(NSString* _Nullable receiver, NSString* _Nullable msgTip); + FOUNDATION_EXPORT void Open_im_sdkUnInitSDK(void); // skipped function UnixSecondToTime with unsupported parameter or return types @@ -853,18 +882,9 @@ FOUNDATION_EXPORT void Open_im_sdkUnInitSDK(void); - (void)onApplicationProcessed:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser AgreeOrReject:(int32_t)AgreeOrReject opReason:(NSString* _Nullable)opReason; - (void)onGroupCreated:(NSString* _Nullable)groupId; - (void)onGroupInfoChanged:(NSString* _Nullable)groupId groupInfo:(NSString* _Nullable)groupInfo; -/** - * list->group - */ - (void)onMemberEnter:(NSString* _Nullable)groupId memberList:(NSString* _Nullable)memberList; -/** - * list->opUser->groupId - */ - (void)onMemberInvited:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser memberList:(NSString* _Nullable)memberList; - (void)onMemberKicked:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser memberList:(NSString* _Nullable)memberList; -/** - * group->one - */ - (void)onMemberLeave:(NSString* _Nullable)groupId member:(NSString* _Nullable)member; - (void)onReceiveJoinApplication:(NSString* _Nullable)groupId member:(NSString* _Nullable)member opReason:(NSString* _Nullable)opReason; @end diff --git a/ios/Framework/OpenIMCore.framework/Versions/A/OpenIMCore b/ios/Framework/OpenIMCore.framework/Versions/A/OpenIMCore index 58ede0b..e84581b 100644 Binary files a/ios/Framework/OpenIMCore.framework/Versions/A/OpenIMCore and b/ios/Framework/OpenIMCore.framework/Versions/A/OpenIMCore differ diff --git a/ios/Framework/OpenIMCore.framework/Versions/Current/Headers/Open_im_sdk.objc.h b/ios/Framework/OpenIMCore.framework/Versions/Current/Headers/Open_im_sdk.objc.h index 84cc504..409eb64 100644 --- a/ios/Framework/OpenIMCore.framework/Versions/Current/Headers/Open_im_sdk.objc.h +++ b/ios/Framework/OpenIMCore.framework/Versions/Current/Headers/Open_im_sdk.objc.h @@ -17,17 +17,17 @@ @class Open_im_sdkConversationListener; @class Open_im_sdkConversationStruct; @class Open_im_sdkFriend; +@class Open_im_sdkGroupApplicationInfo; @class Open_im_sdkGroupApplicationResponseReq; @class Open_im_sdkGroupReqListInfo; @class Open_im_sdkIMConfig; @class Open_im_sdkIMManager; -@class Open_im_sdkInviteUserToGroupReq; -@class Open_im_sdkKickGroupMemberReq; @class Open_im_sdkLogInfo; @class Open_im_sdkMessageReceipt; @class Open_im_sdkMsg; @class Open_im_sdkMsgData; @class Open_im_sdkMsgStruct; +@class Open_im_sdkNotificationContent; @class Open_im_sdkPictureBaseInfo; @class Open_im_sdkPullMsgReq; @class Open_im_sdkPullUserMsgResp; @@ -130,7 +130,9 @@ - (nonnull instancetype)initWithRef:(_Nonnull id)ref; - (nonnull instancetype)init; -// skipped field ArrMsg.Data with unsupported type: []open_im_sdk/open_im_sdk.MsgData +// skipped field ArrMsg.SingleData with unsupported type: []open_im_sdk/open_im_sdk.MsgData + +// skipped field ArrMsg.GroupData with unsupported type: []open_im_sdk/open_im_sdk.MsgData @end @@ -197,6 +199,19 @@ - (nonnull instancetype)init; @end +@interface Open_im_sdkGroupApplicationInfo : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +// skipped field GroupApplicationInfo.Info with unsupported type: open_im_sdk/open_im_sdk.accessOrRefuseGroupApplicationReq + +@property (nonatomic) NSString* _Nonnull handUserID; +@property (nonatomic) NSString* _Nonnull handUserName; +@property (nonatomic) NSString* _Nonnull handUserIcon; +@end + @interface Open_im_sdkGroupApplicationResponseReq : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -242,7 +257,9 @@ @property (nonatomic) int32_t type; @property (nonatomic) int32_t handleStatus; @property (nonatomic) int32_t handleResult; -@property (nonatomic) int32_t isRead; +- (NSString* _Nonnull)key; +// skipped method GroupReqListInfo.Value with unsupported parameter or return types + @end @interface Open_im_sdkIMConfig : NSObject { @@ -266,32 +283,6 @@ @property (nonatomic) long loginState; @end -@interface Open_im_sdkInviteUserToGroupReq : NSObject { -} -@property(strong, readonly) _Nonnull id _ref; - -- (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (nonnull instancetype)init; -@property (nonatomic) NSString* _Nonnull op; -@property (nonatomic) NSString* _Nonnull groupID; -@property (nonatomic) NSString* _Nonnull reason; -// skipped field InviteUserToGroupReq.UidList with unsupported type: []string - -@end - -@interface Open_im_sdkKickGroupMemberReq : NSObject { -} -@property(strong, readonly) _Nonnull id _ref; - -- (nonnull instancetype)initWithRef:(_Nonnull id)ref; -- (nonnull instancetype)init; -@property (nonatomic) NSString* _Nonnull op; -@property (nonatomic) NSString* _Nonnull groupID; -@property (nonatomic) NSString* _Nonnull reason; -// skipped field KickGroupMemberReq.UidList with unsupported type: []string - -@end - @interface Open_im_sdkLogInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -386,10 +377,27 @@ // skipped field MsgStruct.MergeElem with unsupported type: struct{Title string "json:\"title\""; AbstractList []string "json:\"abstractList\""; MultiMessage []*open_im_sdk/open_im_sdk.MsgStruct "json:\"multiMessage\""} -// skipped field MsgStruct.RevokeMessage with unsupported type: struct{ServerMsgID string "json:\"serverMsgID\""; SendID string "json:\"sendID\""; SenderNickname string "json:\"senderNickname\""; RecvID string "json:\"recvID\""; GroupID string "json:\"groupID\""; ContentType int32 "json:\"contentType\""; SendTime int64 "json:\"sendTime\""} +// skipped field MsgStruct.AtElem with unsupported type: struct{Text string "json:\"text\""; AtUserList []string "json:\"atUserList\""; IsAtSelf bool "json:\"isAtSelf\""} + +// skipped field MsgStruct.LocationElem with unsupported type: struct{Description string "json:\"description\""; Longitude float64 "json:\"longitude\""; Latitude float64 "json:\"latitude\""} + +// skipped field MsgStruct.CustomElem with unsupported type: struct{Data string "json:\"data\""; Description string "json:\"description\""; Extension string "json:\"extension\""} + +// skipped field MsgStruct.QuoteElem with unsupported type: struct{Text string "json:\"text\""; QuoteMessage *open_im_sdk/open_im_sdk.MsgStruct "json:\"quoteMessage\""} @end +@interface Open_im_sdkNotificationContent : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int32_t isDisplay; +@property (nonatomic) NSString* _Nonnull defaultTips; +@property (nonatomic) NSString* _Nonnull detail; +@end + @interface Open_im_sdkPictureBaseInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -482,12 +490,12 @@ @end FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptFriendApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationResultTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationTip; +FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkAcceptGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAddConOrUpLatMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkAddFriendTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAtText; -FOUNDATION_EXPORT const int64_t Open_im_sdkC2CMessageAsRead; +FOUNDATION_EXPORT const int64_t Open_im_sdkCard; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdAcceptFriend; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdAddFriend; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdBlackList; @@ -508,6 +516,7 @@ FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkCmdUpdateConversation; FOUNDATION_EXPORT const int64_t Open_im_sdkConAndUnreadChange; FOUNDATION_EXPORT const int64_t Open_im_sdkConChange; FOUNDATION_EXPORT const int64_t Open_im_sdkCreateGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkCustom; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkDeFaultSuccessMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkErrCodeConversation; FOUNDATION_EXPORT const int64_t Open_im_sdkErrCodeFriend; @@ -525,14 +534,20 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionQuitGroup; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionRefuseGroupApplication; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionSetGroupInfo; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupActionTransferGroupOwner; -FOUNDATION_EXPORT const int64_t Open_im_sdkGroupApplicationResponseTip; FOUNDATION_EXPORT const int64_t Open_im_sdkGroupChatType; +/** + * /////////////////////////////////////// + */ +FOUNDATION_EXPORT const int64_t Open_im_sdkGroupTipBegin; +FOUNDATION_EXPORT const int64_t Open_im_sdkGroupTipEnd; FOUNDATION_EXPORT const int64_t Open_im_sdkHasRead; +FOUNDATION_EXPORT const int64_t Open_im_sdkHasReadReceipt; FOUNDATION_EXPORT const int64_t Open_im_sdkIncrUnread; FOUNDATION_EXPORT const int64_t Open_im_sdkInviteUserToGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkJoinGroupTip; FOUNDATION_EXPORT const int64_t Open_im_sdkKickGroupMemberTip; FOUNDATION_EXPORT const int64_t Open_im_sdkKickOnlineTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkLocation; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginSuccess; FOUNDATION_EXPORT const int64_t Open_im_sdkLogining; @@ -541,6 +556,7 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkMerger; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusHasDeleted; +FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusRevoked; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSendFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSendSuccess; /** @@ -550,10 +566,10 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkMsgStatusSending; FOUNDATION_EXPORT const int64_t Open_im_sdkNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkPicture; FOUNDATION_EXPORT const int64_t Open_im_sdkQuitGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkQuote; FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseFriendApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseGroupApplicationResultTip; FOUNDATION_EXPORT const int64_t Open_im_sdkRefuseGroupApplicationTip; -FOUNDATION_EXPORT const int64_t Open_im_sdkRevokeMessageTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkRevoke; FOUNDATION_EXPORT const int64_t Open_im_sdkSetGroupInfoTip; FOUNDATION_EXPORT const int64_t Open_im_sdkSetSelfInfoTip; /** @@ -561,8 +577,12 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkSetSelfInfoTip; SessionType */ FOUNDATION_EXPORT const int64_t Open_im_sdkSingleChatType; +/** + * //////////////////////////////////////// + */ +FOUNDATION_EXPORT const int64_t Open_im_sdkSingleTipBegin; +FOUNDATION_EXPORT const int64_t Open_im_sdkSingleTipEnd; FOUNDATION_EXPORT const int64_t Open_im_sdkSound; -FOUNDATION_EXPORT const int64_t Open_im_sdkSyncSenderMsg; FOUNDATION_EXPORT const int64_t Open_im_sdkSysMsgType; /** * ContentType @@ -571,6 +591,8 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkText; FOUNDATION_EXPORT const int64_t Open_im_sdkTimeOffset; FOUNDATION_EXPORT const int64_t Open_im_sdkTotalUnreadMessageChanged; FOUNDATION_EXPORT const int64_t Open_im_sdkTransferGroupOwnerTip; +FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkTransferGroupTip; +FOUNDATION_EXPORT const int64_t Open_im_sdkTyping; FOUNDATION_EXPORT const int64_t Open_im_sdkUnreadCountSetZero; FOUNDATION_EXPORT const int64_t Open_im_sdkUpdateFaceUrlAndNickName; /** @@ -609,6 +631,10 @@ FOUNDATION_EXPORT void Open_im_sdkAddToBlackList(id _Nullable c FOUNDATION_EXPORT void Open_im_sdkCheckFriend(id _Nullable callback, NSString* _Nullable uidList); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCardMessage(NSString* _Nullable cardInfo); + +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateCustomMessage(NSString* _Nullable data, NSString* _Nullable extension, NSString* _Nullable description); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateFileMessage(NSString* _Nullable filePath, NSString* _Nullable fileName); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateForwardMessage(NSString* _Nullable m); @@ -619,16 +645,20 @@ FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateImageMessage(NSString* _Nu FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateImageMessageFromFullPath(NSString* _Nullable imageFullPath); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateLocationMessage(NSString* _Nullable description, double longitude, double latitude); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateMergerMessage(NSString* _Nullable messageList, NSString* _Nullable title, NSString* _Nullable summaryList); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateQuoteMessage(NSString* _Nullable text, NSString* _Nullable message); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateSoundMessage(NSString* _Nullable soundPath, int64_t duration); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateSoundMessageFromFullPath(NSString* _Nullable soundPath, int64_t duration); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextAtMessage(NSString* _Nullable text, NSString* _Nullable atUserList); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextMessage(NSString* _Nullable text); -FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateTextSystemMessage(NSString* _Nullable text, int32_t textType); - FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateVideoMessage(NSString* _Nullable videoPath, NSString* _Nullable videoType, int64_t duration, NSString* _Nullable snapshotPath); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateVideoMessageFromFullPath(NSString* _Nullable videoFullPath, NSString* _Nullable videoType, int64_t duration, NSString* _Nullable snapshotFullPath); @@ -641,27 +671,11 @@ FOUNDATION_EXPORT void Open_im_sdkDeleteFromFriendList(NSString* _Nullable delet FOUNDATION_EXPORT void Open_im_sdkDeleteMessageFromLocalStorage(id _Nullable callback, NSString* _Nullable message); -FOUNDATION_EXPORT void Open_im_sdkDoCreateGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoGetGroupsInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDoJoinGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoQuitGroup(void); - -FOUNDATION_EXPORT void Open_im_sdkDoSetGroupInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetGroupMemberList(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetGroupMembersInfo(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestGetJoinedGroupList(void); - -FOUNDATION_EXPORT void Open_im_sdkDotestKickGroupMember(void); +FOUNDATION_EXPORT void Open_im_sdkFindMessages(id _Nullable callback, NSString* _Nullable messageIDList); -FOUNDATION_EXPORT void Open_im_sdkDotesttestInviteUserToGroup(void); +FOUNDATION_EXPORT void Open_im_sdkForceReConn(void); -FOUNDATION_EXPORT void Open_im_sdkFindMessages(id _Nullable callback, NSString* _Nullable messageIDList); +FOUNDATION_EXPORT void Open_im_sdkForceSyncApplyGroupRequest(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncBlackList(void); @@ -669,18 +683,27 @@ FOUNDATION_EXPORT void Open_im_sdkForceSyncFriend(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncFriendApplication(void); +FOUNDATION_EXPORT void Open_im_sdkForceSyncGroupRequest(void); + +FOUNDATION_EXPORT void Open_im_sdkForceSyncJoinedGroup(void); + +FOUNDATION_EXPORT void Open_im_sdkForceSyncJoinedGroupMember(void); + FOUNDATION_EXPORT void Open_im_sdkForceSyncLoginUerInfo(void); FOUNDATION_EXPORT void Open_im_sdkForceSyncMsg(void); -FOUNDATION_EXPORT void Open_im_sdkFriendApplication(id _Nullable callback, NSString* _Nullable uid, long flag); - FOUNDATION_EXPORT void Open_im_sdkGetAllConversationList(id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkGetBlackList(id _Nullable callback); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkGetConversationIDBySessionType(NSString* _Nullable sourceID, long sessionType); +/** + * Get the current timestamp by Mill + */ +FOUNDATION_EXPORT int64_t Open_im_sdkGetCurrentTimestampByMill(void); + FOUNDATION_EXPORT void Open_im_sdkGetFriendApplicationList(id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkGetFriendList(id _Nullable callback); @@ -719,13 +742,15 @@ FOUNDATION_EXPORT void Open_im_sdkInviteUserToGroup(NSString* _Nullable groupId, FOUNDATION_EXPORT void Open_im_sdkJoinGroup(NSString* _Nullable groupId, NSString* _Nullable message, id _Nullable callback); -FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable userList, NSString* _Nullable reason, id _Nullable callback); +FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable reason, NSString* _Nullable userList, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogin(NSString* _Nullable uid, NSString* _Nullable tk, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogout(id _Nullable callback); -FOUNDATION_EXPORT void Open_im_sdkMarkC2CMessageAsRead(id _Nullable callback, NSString* _Nullable receiver, NSString* _Nullable msgList); +FOUNDATION_EXPORT void Open_im_sdkMarkC2CMessageAsRead(id _Nullable callback, NSString* _Nullable receiver, NSString* _Nullable msgIDList); + +FOUNDATION_EXPORT void Open_im_sdkMarkGroupMessageHasRead(id _Nullable callback, NSString* _Nullable groupID); FOUNDATION_EXPORT void Open_im_sdkMarkSingleMessageHasRead(id _Nullable callback, NSString* _Nullable userID); @@ -765,6 +790,10 @@ FOUNDATION_EXPORT void Open_im_sdkTencentOssCredentials(id _Nul FOUNDATION_EXPORT void Open_im_sdkTransferGroupOwner(NSString* _Nullable groupId, NSString* _Nullable userId, id _Nullable callback); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkTsetGetGroupApplicationList(id _Nullable callback); + +FOUNDATION_EXPORT void Open_im_sdkTypingStatusUpdate(NSString* _Nullable receiver, NSString* _Nullable msgTip); + FOUNDATION_EXPORT void Open_im_sdkUnInitSDK(void); // skipped function UnixSecondToTime with unsupported parameter or return types @@ -853,18 +882,9 @@ FOUNDATION_EXPORT void Open_im_sdkUnInitSDK(void); - (void)onApplicationProcessed:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser AgreeOrReject:(int32_t)AgreeOrReject opReason:(NSString* _Nullable)opReason; - (void)onGroupCreated:(NSString* _Nullable)groupId; - (void)onGroupInfoChanged:(NSString* _Nullable)groupId groupInfo:(NSString* _Nullable)groupInfo; -/** - * list->group - */ - (void)onMemberEnter:(NSString* _Nullable)groupId memberList:(NSString* _Nullable)memberList; -/** - * list->opUser->groupId - */ - (void)onMemberInvited:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser memberList:(NSString* _Nullable)memberList; - (void)onMemberKicked:(NSString* _Nullable)groupId opUser:(NSString* _Nullable)opUser memberList:(NSString* _Nullable)memberList; -/** - * group->one - */ - (void)onMemberLeave:(NSString* _Nullable)groupId member:(NSString* _Nullable)member; - (void)onReceiveJoinApplication:(NSString* _Nullable)groupId member:(NSString* _Nullable)member opReason:(NSString* _Nullable)opReason; @end diff --git a/ios/Framework/OpenIMCore.framework/Versions/Current/OpenIMCore b/ios/Framework/OpenIMCore.framework/Versions/Current/OpenIMCore index 58ede0b..e84581b 100644 Binary files a/ios/Framework/OpenIMCore.framework/Versions/Current/OpenIMCore and b/ios/Framework/OpenIMCore.framework/Versions/Current/OpenIMCore differ