diff --git a/CHANGELOG.md b/CHANGELOG.md index c3e7c5d..0e893c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.9+6 +Fix bug + ## 0.0.9+5 1. Android upgrade sdk to 0.0.17
2. New add createFileMessageFromFullPath method diff --git a/README.md b/README.md index 9d0d43e..e8b1e2d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ A flutter IM plugin for android and ios. #### 1,Add dependency in yaml - flutter_openim_sdk: ^0.0.9+5 + flutter_openim_sdk: ^0.0.9+6 #### 2,Import package diff --git a/android/build.gradle b/android/build.gradle index 813cf13..364c8fe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -51,5 +51,5 @@ android { } } dependencies { - implementation 'io.openim:client-sdk:0.0.17@aar' + implementation 'io.openim:client-sdk:1.0.6@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java index ca2eba4..27d7604 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java @@ -62,15 +62,15 @@ public class FriendshipManager { Open_im_sdk.refuseFriendApplication(new BaseListener(result), CommonUtil.getJsonUid(methodCall)); } - public void forceSyncFriendApplication(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncFriendApplication(); - } - - public void forceSyncFriend(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncFriend(); - } - - public void forceSyncBlackList(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncBlackList(); - } +// public void forceSyncFriendApplication(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncFriendApplication(); +// } +// +// public void forceSyncFriend(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncFriend(); +// } +// +// public void forceSyncBlackList(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncBlackList(); +// } } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java index 6a7f163..4f61299 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java @@ -108,19 +108,19 @@ public class GroupManager { } - public void forceSyncApplyGroupRequest(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncApplyGroupRequest(); - } - - public void forceSyncGroupRequest(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncGroupRequest(); - } - - public void forceSyncJoinedGroup(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncJoinedGroup(); - } - - public void forceSyncJoinedGroupMember(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceSyncJoinedGroupMember(); - } +// public void forceSyncApplyGroupRequest(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncApplyGroupRequest(); +// } +// +// public void forceSyncGroupRequest(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncGroupRequest(); +// } +// +// public void forceSyncJoinedGroup(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncJoinedGroup(); +// } +// +// public void forceSyncJoinedGroupMember(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceSyncJoinedGroupMember(); +// } } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java index 4cc12fc..c91ba86 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java @@ -26,9 +26,9 @@ public class IMManager { CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginStatus()); } - public void getLoginUid(MethodCall methodCall, MethodChannel.Result result) { - CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginUid()); - } +// public void getLoginUid(MethodCall methodCall, MethodChannel.Result result) { +// CommonUtil.runMainThreadReturn(result, Open_im_sdk.getLoginUid()); +// } public void getUsersInfo(MethodCall methodCall, MethodChannel.Result result) { Open_im_sdk.getUsersInfo(CommonUtil.getUidList(methodCall), new BaseListener(result)); @@ -42,7 +42,7 @@ public class IMManager { Open_im_sdk.forceSyncLoginUerInfo(); } - public void forceReConn(MethodCall methodCall, MethodChannel.Result result) { - Open_im_sdk.forceReConn(); - } +// public void forceReConn(MethodCall methodCall, MethodChannel.Result result) { +// Open_im_sdk.forceReConn(); +// } } diff --git a/example/ios/Runner/Base.lproj/Main.storyboard b/example/ios/Runner/Base.lproj/Main.storyboard index 9655b1a..448a08c 100644 --- a/example/ios/Runner/Base.lproj/Main.storyboard +++ b/example/ios/Runner/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + diff --git a/ios/Classes/Module/FriendshipManager.swift b/ios/Classes/Module/FriendshipManager.swift index d44bf8c..03463c9 100644 --- a/ios/Classes/Module/FriendshipManager.swift +++ b/ios/Classes/Module/FriendshipManager.swift @@ -25,9 +25,9 @@ public class FriendshipManager: BaseServiceManager { self["deleteFromFriendList"] = deleteFromFriendList self["acceptFriendApplication"] = acceptFriendApplication self["refuseFriendApplication"] = refuseFriendApplication - self["forceSyncFriendApplication"] = forceSyncFriendApplication - self["forceSyncFriend"] = forceSyncFriend - self["forceSyncBlackList"] = forceSyncBlackList +// self["forceSyncFriendApplication"] = forceSyncFriendApplication +// self["forceSyncFriend"] = forceSyncFriend +// self["forceSyncBlackList"] = forceSyncBlackList } func setFriendListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -83,20 +83,20 @@ public class FriendshipManager: BaseServiceManager { Open_im_sdkRefuseFriendApplication(BaseCallback(result: result), methodCall[jsonString: "uid"]) } - func forceSyncFriendApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkForceSyncFriendApplication() - callBack(result) - } - - func forceSyncFriend(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkForceSyncFriend() - callBack(result) - } - - func forceSyncBlackList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ - Open_im_sdkForceSyncBlackList() - callBack(result) - } +// func forceSyncFriendApplication(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ +// Open_im_sdkForceSyncFriendApplication() +// callBack(result) +// } +// +// func forceSyncFriend(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ +// Open_im_sdkForceSyncFriend() +// callBack(result) +// } +// +// func forceSyncBlackList(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ +// Open_im_sdkForceSyncBlackList() +// callBack(result) +// } } public class FriendshipListener: NSObject, Open_im_sdkOnFriendshipListenerProtocol { diff --git a/ios/Classes/Module/GroupManager.swift b/ios/Classes/Module/GroupManager.swift index 5357fe8..3d4e33b 100644 --- a/ios/Classes/Module/GroupManager.swift +++ b/ios/Classes/Module/GroupManager.swift @@ -27,10 +27,10 @@ public class GroupManager: BaseServiceManager { self["getGroupApplicationList"] = getGroupApplicationList self["acceptGroupApplication"] = acceptGroupApplication self["refuseGroupApplication"] = refuseGroupApplication - self["forceSyncApplyGroupRequest"] = forceSyncApplyGroupRequest - self["forceSyncGroupRequest"] = forceSyncGroupRequest - self["forceSyncJoinedGroup"] = forceSyncJoinedGroup - self["forceSyncJoinedGroupMember"] = forceSyncJoinedGroupMember +// self["forceSyncApplyGroupRequest"] = forceSyncApplyGroupRequest +// self["forceSyncGroupRequest"] = forceSyncGroupRequest +// self["forceSyncJoinedGroup"] = forceSyncJoinedGroup +// self["forceSyncJoinedGroupMember"] = forceSyncJoinedGroupMember } func setGroupListener(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -97,25 +97,25 @@ public class GroupManager: BaseServiceManager { Open_im_sdkRefuseGroupApplication(methodCall[jsonString: "application"], methodCall[string: "reason"], BaseCallback(result: result)) } - func forceSyncApplyGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncApplyGroupRequest() - callBack(result) - } - - func forceSyncGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncGroupRequest() - callBack(result) - } - - func forceSyncJoinedGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncJoinedGroup() - callBack(result) - } - - func forceSyncJoinedGroupMember(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceSyncJoinedGroupMember() - callBack(result) - } +// func forceSyncApplyGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncApplyGroupRequest() +// callBack(result) +// } +// +// func forceSyncGroupRequest(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncGroupRequest() +// callBack(result) +// } +// +// func forceSyncJoinedGroup(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncJoinedGroup() +// callBack(result) +// } +// +// func forceSyncJoinedGroupMember(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceSyncJoinedGroupMember() +// callBack(result) +// } } public class GroupListener: NSObject, Open_im_sdkOnGroupListenerProtocol { diff --git a/ios/Classes/Module/IMManager.swift b/ios/Classes/Module/IMManager.swift index 7ff5a76..7e5b6de 100644 --- a/ios/Classes/Module/IMManager.swift +++ b/ios/Classes/Module/IMManager.swift @@ -17,11 +17,11 @@ public class IMMananger: BaseServiceManager { self["login"] = login self["logout"] = logout self["getLoginStatus"] = getLoginStatus - self["getLoginUid"] = getLoginUid +// self["getLoginUid"] = getLoginUid self["getUsersInfo"] = getUsersInfo self["setSelfInfo"] = setSelfInfo self["forceSyncLoginUerInfo"] = forceSyncLoginUerInfo - self["forceReConn"] = forceReConn +// self["forceReConn"] = forceReConn } func initSDK(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ @@ -41,9 +41,9 @@ public class IMMananger: BaseServiceManager { callBack(result, Open_im_sdkGetLoginStatus()) } - func getLoginUid(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - callBack(result, Open_im_sdkGetLoginUser()) - } +// func getLoginUid(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// callBack(result, Open_im_sdkGetLoginUser()) +// } func getUsersInfo(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { Open_im_sdkGetUsersInfo(methodCall[jsonString: "uidList"], BaseCallback(result: result)) @@ -58,10 +58,10 @@ public class IMMananger: BaseServiceManager { callBack(result) } - func forceReConn(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { - Open_im_sdkForceReConn() - callBack(result) - } +// func forceReConn(methodCall: FlutterMethodCall, result: @escaping FlutterResult) { +// Open_im_sdkForceReConn() +// callBack(result) +// } } public class SDKListener: NSObject, Open_im_sdkIMSDKListenerProtocol { diff --git a/ios/Classes/Module/MessageManager.swift b/ios/Classes/Module/MessageManager.swift index bb38aee..7d7e704 100644 --- a/ios/Classes/Module/MessageManager.swift +++ b/ios/Classes/Module/MessageManager.swift @@ -146,7 +146,11 @@ public class MessageManager: BaseServiceManager { func createFileMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ callBack(result, Open_im_sdkCreateFileMessage(methodCall[string: "filePath"], methodCall[string: "fileName"])) } - + + func createFileMessageFromFullPath(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ + callBack(result, Open_im_sdkCreateFileMessageFromFullPath(methodCall[string: "filePath"], methodCall[string: "fileName"])) + } + func createMergerMessage(methodCall: FlutterMethodCall, result: @escaping FlutterResult){ let prama = Open_im_sdkCreateMergerMessage(methodCall[jsonString: "messageList"], methodCall[string: "title"], methodCall[jsonString: "summaryList"]) 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 9b9e32e..22f3c62 100644 --- a/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h +++ b/ios/Framework/OpenIMCore.framework/Headers/Open_im_sdk.objc.h @@ -18,6 +18,11 @@ @class Open_im_sdkConversationStruct; @class Open_im_sdkFileBaseInfo; @class Open_im_sdkFriend; +@class Open_im_sdkGatherFormat; +@class Open_im_sdkGeneralWsReq; +@class Open_im_sdkGeneralWsResp; +@class Open_im_sdkGetMaxAndMinSeqReq; +@class Open_im_sdkGetMaxAndMinSeqResp; @class Open_im_sdkGroupApplicationInfo; @class Open_im_sdkGroupApplicationResponseReq; @class Open_im_sdkGroupReqListInfo; @@ -25,20 +30,28 @@ @class Open_im_sdkIMManager; @class Open_im_sdkLogInfo; @class Open_im_sdkMessageReceipt; -@class Open_im_sdkMsg; @class Open_im_sdkMsgData; +@class Open_im_sdkMsgFormat; @class Open_im_sdkMsgStruct; @class Open_im_sdkNotificationContent; @class Open_im_sdkPictureBaseInfo; +@class Open_im_sdkPullMessageBySeqListReq; +@class Open_im_sdkPullMessageBySeqListResp; @class Open_im_sdkPullMsgReq; @class Open_im_sdkPullUserMsgResp; @class Open_im_sdkSendMsgRespFromServer; +@class Open_im_sdkSliceMock; @class Open_im_sdkSoundBaseInfo; @class Open_im_sdkSoundElem; @class Open_im_sdkTransferGroupOwnerReq; @class Open_im_sdkUid2Flag; @class Open_im_sdkUserRelated; +@class Open_im_sdkUserSendMsgReq; +@class Open_im_sdkUserSendMsgResp; @class Open_im_sdkVideoBaseInfo; +@class Open_im_sdkWsMsgData; +@class Open_im_sdkWsSendMsgResp; +@class Open_im_sdkWsSubMsg; @protocol Open_im_sdkBase; @class Open_im_sdkBase; @protocol Open_im_sdkIMSDKListener; @@ -216,6 +229,111 @@ - (nonnull instancetype)init; @end +@interface Open_im_sdkGatherFormat : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +/** + * @inject_tag: json:"id" + */ +@property (nonatomic) NSString* _Nonnull id_; +// skipped field GatherFormat.List with unsupported type: []*open_im_sdk/open_im_sdk.MsgFormat + +// skipped field GatherFormat.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method GatherFormat.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method GatherFormat.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; +@end + +@interface Open_im_sdkGeneralWsReq : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int32_t reqIdentifier; +@property (nonatomic) NSString* _Nonnull token; +@property (nonatomic) NSString* _Nonnull sendID; +@property (nonatomic) NSString* _Nonnull operationID; +@property (nonatomic) NSString* _Nonnull msgIncr; +@property (nonatomic) NSData* _Nullable data; +@end + +@interface Open_im_sdkGeneralWsResp : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) long reqIdentifier; +@property (nonatomic) long errCode; +@property (nonatomic) NSString* _Nonnull errMsg; +@property (nonatomic) NSString* _Nonnull msgIncr; +@property (nonatomic) NSString* _Nonnull operationID; +@property (nonatomic) NSData* _Nullable data; +@end + +@interface Open_im_sdkGetMaxAndMinSeqReq : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +// skipped field GetMaxAndMinSeqReq.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method GetMaxAndMinSeqReq.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method GetMaxAndMinSeqReq.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; +@end + +@interface Open_im_sdkGetMaxAndMinSeqResp : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int64_t maxSeq; +@property (nonatomic) int64_t minSeq; +// skipped field GetMaxAndMinSeqResp.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method GetMaxAndMinSeqResp.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method GetMaxAndMinSeqResp.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; +@end + @interface Open_im_sdkGroupApplicationInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -324,38 +442,111 @@ @property (nonatomic) int32_t sessionType; @end -@interface Open_im_sdkMsg : NSObject { +@interface Open_im_sdkMsgData : NSObject { } @property(strong, readonly) _Nonnull id _ref; - (nonnull instancetype)initWithRef:(_Nonnull id)ref; - (nonnull instancetype)init; -@property (nonatomic) long reqIdentifier; -@property (nonatomic) long errCode; -@property (nonatomic) NSString* _Nonnull errMsg; -// skipped field Msg.Data with unsupported type: open_im_sdk/open_im_sdk.MsgData +@property (nonatomic) NSString* _Nonnull sendID; +@property (nonatomic) NSString* _Nonnull recvID; +@property (nonatomic) int32_t sessionType; +@property (nonatomic) int32_t msgFrom; +@property (nonatomic) int32_t contentType; +@property (nonatomic) NSString* _Nonnull serverMsgID; +@property (nonatomic) NSString* _Nonnull content; +@property (nonatomic) int64_t sendTime; +@property (nonatomic) int64_t seq; +@property (nonatomic) int32_t senderPlatformID; +@property (nonatomic) NSString* _Nonnull senderNickName; +@property (nonatomic) NSString* _Nonnull senderFaceURL; +@property (nonatomic) NSString* _Nonnull clientMsgID; +// skipped field MsgData.XXX_NoUnkeyedLiteral with unsupported type: struct{} +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method MsgData.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method MsgData.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; @end -@interface Open_im_sdkMsgData : NSObject { +@interface Open_im_sdkMsgFormat : NSObject { } @property(strong, readonly) _Nonnull id _ref; - (nonnull instancetype)initWithRef:(_Nonnull id)ref; - (nonnull instancetype)init; +/** + * @inject_tag: json:"sendID" + */ @property (nonatomic) NSString* _Nonnull sendID; +/** + * @inject_tag: json:"recvID" + */ @property (nonatomic) NSString* _Nonnull recvID; -@property (nonatomic) int32_t sessionType; +/** + * @inject_tag: json:"msgFrom" + */ @property (nonatomic) int32_t msgFrom; +/** + * @inject_tag: json:"contentType" + */ @property (nonatomic) int32_t contentType; +/** + * @inject_tag: json:"serverMsgID" + */ @property (nonatomic) NSString* _Nonnull serverMsgID; +/** + * @inject_tag: json:"content" + */ @property (nonatomic) NSString* _Nonnull content; -@property (nonatomic) int64_t sendTime; +/** + * @inject_tag: json:"seq" + */ @property (nonatomic) int64_t seq; +/** + * @inject_tag: json:"sendTime" + */ +@property (nonatomic) int64_t sendTime; +/** + * @inject_tag: json:"senderPlatformID" + */ @property (nonatomic) int32_t senderPlatformID; +/** + * @inject_tag: json:"senderNickName" + */ @property (nonatomic) NSString* _Nonnull senderNickName; +/** + * @inject_tag: json:"senderFaceUrl" + */ @property (nonatomic) NSString* _Nonnull senderFaceURL; +/** + * @inject_tag: json:"clientMsgID" + */ @property (nonatomic) NSString* _Nonnull clientMsgID; +// skipped field MsgFormat.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method MsgFormat.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method MsgFormat.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; @end @interface Open_im_sdkMsgStruct : NSObject { @@ -429,9 +620,60 @@ @property (nonatomic) NSString* _Nonnull url; @end -/** - * //////////////////////// message///////////////////////// - */ +@interface Open_im_sdkPullMessageBySeqListReq : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +// skipped field PullMessageBySeqListReq.SeqList with unsupported type: []int64 + +// skipped field PullMessageBySeqListReq.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method PullMessageBySeqListReq.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method PullMessageBySeqListReq.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; +@end + +@interface Open_im_sdkPullMessageBySeqListResp : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int64_t maxSeq; +@property (nonatomic) int64_t minSeq; +// skipped field PullMessageBySeqListResp.SingleUserMsg with unsupported type: []*open_im_sdk/open_im_sdk.GatherFormat + +// skipped field PullMessageBySeqListResp.GroupUserMsg with unsupported type: []*open_im_sdk/open_im_sdk.GatherFormat + +// skipped field PullMessageBySeqListResp.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method PullMessageBySeqListResp.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method PullMessageBySeqListResp.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; +@end + @interface Open_im_sdkPullMsgReq : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -471,6 +713,14 @@ @end +@interface Open_im_sdkSliceMock : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@end + @interface Open_im_sdkSoundBaseInfo : NSObject { } @property(strong, readonly) _Nonnull id _ref; @@ -539,6 +789,8 @@ - (void)acceptFriendApplication:(id _Nullable)callback uid:(NSString* _Nullable)uid; - (void)acceptGroupApplication:(NSString* _Nullable)application reason:(NSString* _Nullable)reason callback:(id _Nullable)callback; - (void)addAdvancedMsgListener:(id _Nullable)listener; +// skipped method UserRelated.AddCh with unsupported parameter or return types + - (void)addFriend:(id _Nullable)callback paramsReq:(NSString* _Nullable)paramsReq; - (void)addToBlackList:(id _Nullable)callback blackUid:(NSString* _Nullable)blackUid; - (void)checkFriend:(id _Nullable)callback uidList:(NSString* _Nullable)uidList; @@ -546,6 +798,7 @@ - (NSString* _Nonnull)createCustomMessage:(NSString* _Nullable)data extension:(NSString* _Nullable)extension description:(NSString* _Nullable)description; - (NSString* _Nonnull)createFileMessage:(NSString* _Nullable)filePath fileName:(NSString* _Nullable)fileName; - (NSString* _Nonnull)createFileMessageByURL:(NSString* _Nullable)fileBaseInfo; +- (NSString* _Nonnull)createFileMessageFromFullPath:(NSString* _Nullable)fileFullPath fileName:(NSString* _Nullable)fileName; - (NSString* _Nonnull)createForwardMessage:(NSString* _Nullable)m; - (void)createGroup:(NSString* _Nullable)gInfo memberList:(NSString* _Nullable)memberList callback:(id _Nullable)callback; - (NSString* _Nonnull)createImageMessage:(NSString* _Nullable)imagePath; @@ -562,6 +815,7 @@ - (NSString* _Nonnull)createVideoMessage:(NSString* _Nullable)videoPath videoType:(NSString* _Nullable)videoType duration:(int64_t)duration snapshotPath:(NSString* _Nullable)snapshotPath; - (NSString* _Nonnull)createVideoMessageByURL:(NSString* _Nullable)videoBaseInfo; - (NSString* _Nonnull)createVideoMessageFromFullPath:(NSString* _Nullable)videoFullPath videoType:(NSString* _Nullable)videoType duration:(int64_t)duration snapshotFullPath:(NSString* _Nullable)snapshotFullPath; +- (void)delCh:(NSString* _Nullable)msgIncr; - (void)deleteConversation:(NSString* _Nullable)conversationID callback:(id _Nullable)callback; - (void)deleteFromBlackList:(id _Nullable)callback deleteUid:(NSString* _Nullable)deleteUid; - (void)deleteFromFriendList:(NSString* _Nullable)deleteUid callback:(id _Nullable)callback; @@ -575,10 +829,13 @@ - (void)forceSyncGroupRequest; - (void)forceSyncJoinedGroup; - (void)forceSyncJoinedGroupMember; -- (void)forceSyncLoginUerInfo; -- (void)forceSyncMsg; +- (void)forceSyncLoginUserInfo; +- (BOOL)forceSyncMsg; +- (NSString* _Nonnull)genMsgIncr; - (void)getAllConversationList:(id _Nullable)callback; - (void)getBlackList:(id _Nullable)callback; +// skipped method UserRelated.GetCh with unsupported parameter or return types + - (void)getFriendApplicationList:(id _Nullable)callback; - (void)getFriendList:(id _Nullable)callback; - (void)getFriendsInfo:(id _Nullable)callback uidList:(NSString* _Nullable)uidList; @@ -590,6 +847,7 @@ - (void)getJoinedGroupList:(id _Nullable)callback; - (long)getLoginStatus; - (NSString* _Nonnull)getLoginUser; +- (int64_t)getMinSeqSvr; - (void)getMultipleConversation:(NSString* _Nullable)conversationIDList callback:(id _Nullable)callback; - (void)getOneConversation:(NSString* _Nullable)sourceID sessionType:(long)sessionType callback:(id _Nullable)callback; - (void)getTotalUnreadMsgCount:(id _Nullable)callback; @@ -624,12 +882,75 @@ - (BOOL)setFriendListener:(id _Nullable)listener; - (void)setGroupInfo:(NSString* _Nullable)jsonGroupInfo callback:(id _Nullable)callback; - (void)setGroupListener:(id _Nullable)callback; +- (void)setMinSeqSvr:(int64_t)minSeqSvr; - (void)setSelfInfo:(NSString* _Nullable)info cb:(id _Nullable)cb; -- (void)tencentOssCredentials:(id _Nullable)cb; - (void)transferGroupOwner:(NSString* _Nullable)groupId userId:(NSString* _Nullable)userId callback:(id _Nullable)callback; -- (NSString* _Nonnull)tsetGetGroupApplicationList:(id _Nullable)callback; - (void)typingStatusUpdate:(NSString* _Nullable)receiver msgTip:(NSString* _Nullable)msgTip; - (void)unInitSDK; +// skipped method UserRelated.WriteMsg with unsupported parameter or return types + +@end + +@interface Open_im_sdkUserSendMsgReq : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +// skipped field UserSendMsgReq.Options with unsupported type: map[string]int32 + +@property (nonatomic) NSString* _Nonnull senderNickName; +@property (nonatomic) NSString* _Nonnull senderFaceURL; +@property (nonatomic) int32_t platformID; +@property (nonatomic) int32_t sessionType; +@property (nonatomic) int32_t msgFrom; +@property (nonatomic) int32_t contentType; +@property (nonatomic) NSString* _Nonnull recvID; +// skipped field UserSendMsgReq.ForceList with unsupported type: []string + +@property (nonatomic) NSString* _Nonnull content; +@property (nonatomic) NSString* _Nonnull clientMsgID; +// skipped field UserSendMsgReq.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method UserSendMsgReq.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method UserSendMsgReq.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; +@end + +@interface Open_im_sdkUserSendMsgResp : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) NSString* _Nonnull serverMsgID; +@property (nonatomic) NSString* _Nonnull clientMsgID; +@property (nonatomic) int64_t sendTime; +// skipped field UserSendMsgResp.XXX_NoUnkeyedLiteral with unsupported type: struct{} + +@property (nonatomic) NSData* _Nullable xxX_unrecognized; +@property (nonatomic) int32_t xxX_sizecache; +// skipped method UserSendMsgResp.Descriptor with unsupported parameter or return types + +- (void)protoMessage; +- (void)reset; +- (NSString* _Nonnull)string; +- (void)xxX_DiscardUnknown; +- (NSData* _Nullable)xxX_Marshal:(NSData* _Nullable)b deterministic:(BOOL)deterministic error:(NSError* _Nullable* _Nullable)error; +// skipped method UserSendMsgResp.XXX_Merge with unsupported parameter or return types + +- (long)xxX_Size; +- (BOOL)xxX_Unmarshal:(NSData* _Nullable)b error:(NSError* _Nullable* _Nullable)error; @end @interface Open_im_sdkVideoBaseInfo : NSObject { @@ -652,6 +973,51 @@ @property (nonatomic) int32_t snapshotHeight; @end +@interface Open_im_sdkWsMsgData : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int32_t platformID; +@property (nonatomic) int32_t sessionType; +@property (nonatomic) int32_t msgFrom; +@property (nonatomic) int32_t contentType; +@property (nonatomic) NSString* _Nonnull recvID; +// skipped field WsMsgData.ForceList with unsupported type: []string + +@property (nonatomic) NSString* _Nonnull content; +// skipped field WsMsgData.Options with unsupported type: map[string]interface{} + +@property (nonatomic) NSString* _Nonnull clientMsgID; +// skipped field WsMsgData.OfflineInfo with unsupported type: map[string]interface{} + +// skipped field WsMsgData.Ext with unsupported type: map[string]interface{} + +@end + +@interface Open_im_sdkWsSendMsgResp : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) NSString* _Nonnull serverMsgID; +@property (nonatomic) NSString* _Nonnull clientMsgID; +@property (nonatomic) int64_t sendTime; +@end + +@interface Open_im_sdkWsSubMsg : NSObject { +} +@property(strong, readonly) _Nonnull id _ref; + +- (nonnull instancetype)initWithRef:(_Nonnull id)ref; +- (nonnull instancetype)init; +@property (nonatomic) int64_t sendTime; +@property (nonatomic) NSString* _Nonnull serverMsgID; +@property (nonatomic) NSString* _Nonnull clientMsgID; +@end + FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptFriendApplicationTip; FOUNDATION_EXPORT const int64_t Open_im_sdkAcceptGroupApplicationTip; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkAcceptGroupTip; @@ -715,6 +1081,7 @@ FOUNDATION_EXPORT const int64_t Open_im_sdkLoginFailed; FOUNDATION_EXPORT const int64_t Open_im_sdkLoginSuccess; FOUNDATION_EXPORT const int64_t Open_im_sdkLogining; FOUNDATION_EXPORT const int64_t Open_im_sdkLogoutCmd; +FOUNDATION_EXPORT const int64_t Open_im_sdkMaxTotalMsgLen; FOUNDATION_EXPORT const int64_t Open_im_sdkMerger; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasNotRead; FOUNDATION_EXPORT const int64_t Open_im_sdkMessageHasRead; @@ -764,9 +1131,18 @@ MsgFrom */ FOUNDATION_EXPORT const int64_t Open_im_sdkUserMsgType; FOUNDATION_EXPORT const int64_t Open_im_sdkVideo; +FOUNDATION_EXPORT const int64_t Open_im_sdkWSDataError; +FOUNDATION_EXPORT const int64_t Open_im_sdkWSGetNewestSeq; +FOUNDATION_EXPORT const int64_t Open_im_sdkWSPullMsg; +FOUNDATION_EXPORT const int64_t Open_im_sdkWSPullMsgBySeqList; +FOUNDATION_EXPORT const int64_t Open_im_sdkWSPushMsg; +FOUNDATION_EXPORT const int64_t Open_im_sdkWSSendMsg; FOUNDATION_EXPORT NSString* _Nonnull const Open_im_sdkZoomScale; @interface Open_im_sdk : NSObject ++ (int32_t) sdkLogFlag; ++ (void) setSdkLogFlag:(int32_t)v; + // skipped variable SvrConf with unsupported type: open_im_sdk/open_im_sdk.IMConfig // skipped variable UserRouterMap with unsupported type: map[string]*open_im_sdk/open_im_sdk.UserRelated @@ -795,6 +1171,8 @@ FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateFileMessage(NSString* _Nul FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateFileMessageByURL(NSString* _Nullable fileBaseInfo); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateFileMessageFromFullPath(NSString* _Nullable fileFullPath, NSString* _Nullable fileName); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkCreateForwardMessage(NSString* _Nullable m); FOUNDATION_EXPORT void Open_im_sdkCreateGroup(NSString* _Nullable gInfo, NSString* _Nullable memberList, id _Nullable callback); @@ -837,25 +1215,9 @@ FOUNDATION_EXPORT void Open_im_sdkDeleteMessageFromLocalStorage(id _Nullable callback, NSString* _Nullable messageIDList); -FOUNDATION_EXPORT void Open_im_sdkForceReConn(void); - -FOUNDATION_EXPORT void Open_im_sdkForceSyncApplyGroupRequest(void); - -FOUNDATION_EXPORT void Open_im_sdkForceSyncBlackList(void); - -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 BOOL Open_im_sdkForceSyncMsg(void); FOUNDATION_EXPORT void Open_im_sdkGetAllConversationList(id _Nullable callback); @@ -900,8 +1262,6 @@ FOUNDATION_EXPORT Open_im_sdkUserRelated* _Nullable Open_im_sdkGetUserWorker(NSS FOUNDATION_EXPORT void Open_im_sdkGetUsersInfo(NSString* _Nullable uIDList, id _Nullable cb); -FOUNDATION_EXPORT void Open_im_sdkInitAddr(void); - FOUNDATION_EXPORT BOOL Open_im_sdkInitOnce(Open_im_sdkIMConfig* _Nullable config); FOUNDATION_EXPORT BOOL Open_im_sdkInitSDK(NSString* _Nullable config, id _Nullable cb); @@ -914,6 +1274,21 @@ FOUNDATION_EXPORT void Open_im_sdkJoinGroup(NSString* _Nullable groupId, NSStrin FOUNDATION_EXPORT void Open_im_sdkKickGroupMember(NSString* _Nullable groupId, NSString* _Nullable reason, NSString* _Nullable userList, id _Nullable callback); +// skipped function LogBegin with unsupported parameter or return types + + +// skipped function LogEnd with unsupported parameter or return types + + +// skipped function LogFReturn with unsupported parameter or return types + + +// skipped function LogSReturn with unsupported parameter or return types + + +// skipped function LogStart with unsupported parameter or return types + + FOUNDATION_EXPORT void Open_im_sdkLogin(NSString* _Nullable uid, NSString* _Nullable tk, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkLogout(id _Nullable callback); @@ -928,6 +1303,9 @@ FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkMd5(NSString* _Nullable s); FOUNDATION_EXPORT void Open_im_sdkPinConversation(NSString* _Nullable conversationID, BOOL isPinned, id _Nullable callback); +// skipped function Post2Api with unsupported parameter or return types + + FOUNDATION_EXPORT void Open_im_sdkQuitGroup(NSString* _Nullable groupId, id _Nullable callback); FOUNDATION_EXPORT void Open_im_sdkRefuseFriendApplication(id _Nullable callback, NSString* _Nullable uid); @@ -936,6 +1314,10 @@ FOUNDATION_EXPORT void Open_im_sdkRefuseGroupApplication(NSString* _Nullable app FOUNDATION_EXPORT void Open_im_sdkRevokeMessage(id _Nullable callback, NSString* _Nullable message); +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkRunFuncName(void); + +FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkSdkVersion(void); + FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkSendMessage(id _Nullable callback, NSString* _Nullable message, NSString* _Nullable receiver, NSString* _Nullable groupID, BOOL onlineUserOnly); FOUNDATION_EXPORT NSString* _Nonnull Open_im_sdkSendMessageNotOss(id _Nullable callback, NSString* _Nullable message, NSString* _Nullable receiver, NSString* _Nullable groupID, BOOL onlineUserOnly); @@ -952,14 +1334,17 @@ FOUNDATION_EXPORT void Open_im_sdkSetGroupInfo(NSString* _Nullable jsonGroupInfo FOUNDATION_EXPORT void Open_im_sdkSetGroupListener(id _Nullable callback); +/** + * 1 no print + */ +FOUNDATION_EXPORT void Open_im_sdkSetSdkLog(int32_t flag); + FOUNDATION_EXPORT void Open_im_sdkSetSelfInfo(NSString* _Nullable info, id _Nullable cb); -FOUNDATION_EXPORT void Open_im_sdkTencentOssCredentials(id _Nullable cb); +FOUNDATION_EXPORT int64_t Open_im_sdkStringToInt64(NSString* _Nullable i); 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); diff --git a/ios/Framework/OpenIMCore.framework/OpenIMCore b/ios/Framework/OpenIMCore.framework/OpenIMCore index bf48041..7a1261d 100644 Binary files a/ios/Framework/OpenIMCore.framework/OpenIMCore and b/ios/Framework/OpenIMCore.framework/OpenIMCore differ diff --git a/lib/src/manager/im_friendship_manager.dart b/lib/src/manager/im_friendship_manager.dart index 3d01471..517d1d2 100644 --- a/lib/src/manager/im_friendship_manager.dart +++ b/lib/src/manager/im_friendship_manager.dart @@ -104,19 +104,19 @@ class FriendshipManager { } /// - Future forceSyncFriendApplication() { - return _channel.invokeMethod('forceSyncFriendApplication', _buildParam({})); - } + // Future forceSyncFriendApplication() { + // return _channel.invokeMethod('forceSyncFriendApplication', _buildParam({})); + // } /// - Future forceSyncFriend() { - return _channel.invokeMethod('forceSyncFriend', _buildParam({})); - } + // Future forceSyncFriend() { + // return _channel.invokeMethod('forceSyncFriend', _buildParam({})); + // } /// - Future forceSyncBlackList() { - return _channel.invokeMethod('forceSyncBlackList', _buildParam({})); - } + // Future forceSyncBlackList() { + // return _channel.invokeMethod('forceSyncBlackList', _buildParam({})); + // } static Map _buildParam(Map param) { param["ManagerName"] = "friendshipManager"; diff --git a/lib/src/manager/im_group_manager.dart b/lib/src/manager/im_group_manager.dart index ba27751..cddb5e5 100644 --- a/lib/src/manager/im_group_manager.dart +++ b/lib/src/manager/im_group_manager.dart @@ -254,24 +254,24 @@ class GroupManager { } /// - Future forceSyncApplyGroupRequest() { - return _channel.invokeMethod('forceSyncApplyGroupRequest', _buildParam({})); - } + // Future forceSyncApplyGroupRequest() { + // return _channel.invokeMethod('forceSyncApplyGroupRequest', _buildParam({})); + // } /// - Future forceSyncGroupRequest() { - return _channel.invokeMethod('forceSyncGroupRequest', _buildParam({})); - } + // Future forceSyncGroupRequest() { + // return _channel.invokeMethod('forceSyncGroupRequest', _buildParam({})); + // } /// - Future forceSyncJoinedGroup() { - return _channel.invokeMethod('forceSyncJoinedGroup', _buildParam({})); - } + // Future forceSyncJoinedGroup() { + // return _channel.invokeMethod('forceSyncJoinedGroup', _buildParam({})); + // } /// - Future forceSyncJoinedGroupMember() { - return _channel.invokeMethod('forceSyncJoinedGroupMember', _buildParam({})); - } + // Future forceSyncJoinedGroupMember() { + // return _channel.invokeMethod('forceSyncJoinedGroupMember', _buildParam({})); + // } static Map _buildParam(Map param) { param["ManagerName"] = "groupManager"; diff --git a/lib/src/manager/im_manager.dart b/lib/src/manager/im_manager.dart index c33d26d..6a8a635 100644 --- a/lib/src/manager/im_manager.dart +++ b/lib/src/manager/im_manager.dart @@ -9,12 +9,14 @@ class IMManager { late FriendshipManager friendshipManager; late MessageManager messageManager; late GroupManager groupManager; + // late OfflinePushManager offlinePushManager; // late SignalingManager signalingManager; late InitSDKListener _initSDKListener; late String uid; late UserInfo uInfo; bool isInitialized = false; + bool isLogined = false; IMManager(this._channel) { conversationManager = ConversationManager(_channel); @@ -308,13 +310,16 @@ class IMManager { 'login', _buildParam({'uid': uid, 'token': token}), ); + this.isLogined = true; this.uInfo = (await getUsersInfo([uid])).first; return uInfo; } /// Logout sdk - Future logout() { - return _channel.invokeMethod('logout', _buildParam({})); + Future logout() async { + var value = await _channel.invokeMethod('logout', _buildParam({})); + this.isLogined = false; + return value; } /// @@ -371,9 +376,9 @@ class IMManager { } /// - Future forceReConn() { - return _channel.invokeMethod('forceReConn', _buildParam({})); - } + // Future forceReConn() { + // return _channel.invokeMethod('forceReConn', _buildParam({})); + // } static Map _buildParam(Map param) { param["ManagerName"] = "imManager"; diff --git a/pubspec.yaml b/pubspec.yaml index dafddec..1fa7933 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_openim_sdk description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source. -version: 0.0.9+5 +version: 0.0.9+6 homepage: https://www.rentsoft.cn repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter