Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
std-s committed Jul 25, 2022
2 parents 5b071b5 + a75e8a5 commit 93d7a15
Show file tree
Hide file tree
Showing 14 changed files with 121 additions and 50 deletions.
52 changes: 26 additions & 26 deletions Example/OpenIMSDKiOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
17CADD2827C7227F0069C80E /* voice_test.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 17CADD2627C7227F0069C80E /* voice_test.m4a */; };
17CADD2A27C738630069C80E /* video_test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 17CADD2927C738630069C80E /* video_test.mp4 */; };
17CADD2C27C7781C0069C80E /* file_test.zip in Resources */ = {isa = PBXBuildFile; fileRef = 17CADD2B27C7781C0069C80E /* file_test.zip */; };
2D9C01C7B174B431FA412A16 /* Pods_OpenIMSDKiOS_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A1F5DD09F8C1F2631B1166B /* Pods_OpenIMSDKiOS_Example.framework */; };
3DD407C03CE2C81D9D7A112E /* Pods_OpenIMSDKiOS_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D52325FDCDD29B63882184E /* Pods_OpenIMSDKiOS_Tests.framework */; };
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
Expand All @@ -27,8 +25,10 @@
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
6FA0112F1274CB6E2354C758 /* Pods_OpenIMSDKiOS_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32F128D1470B06032A984108 /* Pods_OpenIMSDKiOS_Tests.framework */; };
71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
DE5E135E2DAD817A8EFF7D39 /* Pods_OpenIMSDKiOS_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46D633C11696D9551823A379 /* Pods_OpenIMSDKiOS_Example.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -42,14 +42,16 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
05B9BEF429A580E59A85290C /* Pods-OpenIMSDKiOS_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Example.debug.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Example/Pods-OpenIMSDKiOS_Example.debug.xcconfig"; sourceTree = "<group>"; };
0C4FBE61DD83E19F3E2AFCF8 /* Pods-OpenIMSDKiOS_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Example.debug.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Example/Pods-OpenIMSDKiOS_Example.debug.xcconfig"; sourceTree = "<group>"; };
17918D0527BC8F380040C924 /* OPENIMSDKTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OPENIMSDKTableViewCell.h; sourceTree = "<group>"; };
17918D0627BC8F380040C924 /* OPENIMSDKTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OPENIMSDKTableViewCell.m; sourceTree = "<group>"; };
17CADD2527C7227F0069C80E /* photo_test.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = photo_test.jpeg; sourceTree = "<group>"; };
17CADD2627C7227F0069C80E /* voice_test.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = voice_test.m4a; sourceTree = "<group>"; };
17CADD2927C738630069C80E /* video_test.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = video_test.mp4; sourceTree = "<group>"; };
17CADD2B27C7781C0069C80E /* file_test.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = file_test.zip; sourceTree = "<group>"; };
2BB1836A648652266E0E8D67 /* Pods-OpenIMSDKiOS_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Tests.debug.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Tests/Pods-OpenIMSDKiOS_Tests.debug.xcconfig"; sourceTree = "<group>"; };
2F5C85EAF2917B9B7EE7FAE5 /* Pods-OpenIMSDKiOS_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Tests.release.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Tests/Pods-OpenIMSDKiOS_Tests.release.xcconfig"; sourceTree = "<group>"; };
32F128D1470B06032A984108 /* Pods_OpenIMSDKiOS_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenIMSDKiOS_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
46D633C11696D9551823A379 /* Pods_OpenIMSDKiOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenIMSDKiOS_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6003F58A195388D20070C39A /* OpenIMSDKiOS_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenIMSDKiOS_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
Expand All @@ -69,12 +71,10 @@
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
6D52325FDCDD29B63882184E /* Pods_OpenIMSDKiOS_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenIMSDKiOS_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8A1F5DD09F8C1F2631B1166B /* Pods_OpenIMSDKiOS_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenIMSDKiOS_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BA3265BA6222E998D20796CC /* Pods-OpenIMSDKiOS_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Example.release.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Example/Pods-OpenIMSDKiOS_Example.release.xcconfig"; sourceTree = "<group>"; };
F4E0D93B0A25D0B5AFB09DA0 /* Pods-OpenIMSDKiOS_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Tests.release.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Tests/Pods-OpenIMSDKiOS_Tests.release.xcconfig"; sourceTree = "<group>"; };
B0099331627CECA50F92C42B /* Pods-OpenIMSDKiOS_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Tests.debug.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Tests/Pods-OpenIMSDKiOS_Tests.debug.xcconfig"; sourceTree = "<group>"; };
F19969F18161B255B85AA5C4 /* Pods-OpenIMSDKiOS_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenIMSDKiOS_Example.release.xcconfig"; path = "Target Support Files/Pods-OpenIMSDKiOS_Example/Pods-OpenIMSDKiOS_Example.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -85,7 +85,7 @@
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
2D9C01C7B174B431FA412A16 /* Pods_OpenIMSDKiOS_Example.framework in Frameworks */,
DE5E135E2DAD817A8EFF7D39 /* Pods_OpenIMSDKiOS_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -96,7 +96,7 @@
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
3DD407C03CE2C81D9D7A112E /* Pods_OpenIMSDKiOS_Tests.framework in Frameworks */,
6FA0112F1274CB6E2354C758 /* Pods_OpenIMSDKiOS_Tests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -106,10 +106,10 @@
544C9C856FBE08EA043EC01E /* Pods */ = {
isa = PBXGroup;
children = (
05B9BEF429A580E59A85290C /* Pods-OpenIMSDKiOS_Example.debug.xcconfig */,
BA3265BA6222E998D20796CC /* Pods-OpenIMSDKiOS_Example.release.xcconfig */,
2BB1836A648652266E0E8D67 /* Pods-OpenIMSDKiOS_Tests.debug.xcconfig */,
F4E0D93B0A25D0B5AFB09DA0 /* Pods-OpenIMSDKiOS_Tests.release.xcconfig */,
0C4FBE61DD83E19F3E2AFCF8 /* Pods-OpenIMSDKiOS_Example.debug.xcconfig */,
F19969F18161B255B85AA5C4 /* Pods-OpenIMSDKiOS_Example.release.xcconfig */,
B0099331627CECA50F92C42B /* Pods-OpenIMSDKiOS_Tests.debug.xcconfig */,
2F5C85EAF2917B9B7EE7FAE5 /* Pods-OpenIMSDKiOS_Tests.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -141,8 +141,8 @@
6003F58F195388D20070C39A /* CoreGraphics.framework */,
6003F591195388D20070C39A /* UIKit.framework */,
6003F5AF195388D20070C39A /* XCTest.framework */,
8A1F5DD09F8C1F2631B1166B /* Pods_OpenIMSDKiOS_Example.framework */,
6D52325FDCDD29B63882184E /* Pods_OpenIMSDKiOS_Tests.framework */,
46D633C11696D9551823A379 /* Pods_OpenIMSDKiOS_Example.framework */,
32F128D1470B06032A984108 /* Pods_OpenIMSDKiOS_Tests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -206,11 +206,11 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "OpenIMSDKiOS_Example" */;
buildPhases = (
3E5CB7774DB6A7ECCDD58FC2 /* [CP] Check Pods Manifest.lock */,
627EE26D4E088426270CC30A /* [CP] Check Pods Manifest.lock */,
6003F586195388D20070C39A /* Sources */,
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
ABCDE812A659A8D1C1DFF64F /* [CP] Embed Pods Frameworks */,
7C12A7DC5F069E2875ABA0D8 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -225,7 +225,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "OpenIMSDKiOS_Tests" */;
buildPhases = (
02150235D7ACF5864BD37507 /* [CP] Check Pods Manifest.lock */,
3E6EC12A9568DBF85E827CFE /* [CP] Check Pods Manifest.lock */,
6003F5AA195388D20070C39A /* Sources */,
6003F5AB195388D20070C39A /* Frameworks */,
6003F5AC195388D20070C39A /* Resources */,
Expand Down Expand Up @@ -306,7 +306,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
02150235D7ACF5864BD37507 /* [CP] Check Pods Manifest.lock */ = {
3E6EC12A9568DBF85E827CFE /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -328,7 +328,7 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
3E5CB7774DB6A7ECCDD58FC2 /* [CP] Check Pods Manifest.lock */ = {
627EE26D4E088426270CC30A /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -350,7 +350,7 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
ABCDE812A659A8D1C1DFF64F /* [CP] Embed Pods Frameworks */ = {
7C12A7DC5F069E2875ABA0D8 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -503,7 +503,7 @@
};
6003F5C0195388D20070C39A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 05B9BEF429A580E59A85290C /* Pods-OpenIMSDKiOS_Example.debug.xcconfig */;
baseConfigurationReference = 0C4FBE61DD83E19F3E2AFCF8 /* Pods-OpenIMSDKiOS_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand All @@ -523,7 +523,7 @@
};
6003F5C1195388D20070C39A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BA3265BA6222E998D20796CC /* Pods-OpenIMSDKiOS_Example.release.xcconfig */;
baseConfigurationReference = F19969F18161B255B85AA5C4 /* Pods-OpenIMSDKiOS_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand All @@ -543,7 +543,7 @@
};
6003F5C3195388D20070C39A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2BB1836A648652266E0E8D67 /* Pods-OpenIMSDKiOS_Tests.debug.xcconfig */;
baseConfigurationReference = B0099331627CECA50F92C42B /* Pods-OpenIMSDKiOS_Tests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -568,7 +568,7 @@
};
6003F5C4195388D20070C39A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F4E0D93B0A25D0B5AFB09DA0 /* Pods-OpenIMSDKiOS_Tests.release.xcconfig */;
baseConfigurationReference = 2F5C85EAF2917B9B7EE7FAE5 /* Pods-OpenIMSDKiOS_Tests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand Down
2 changes: 1 addition & 1 deletion Example/OpenIMSDKiOS/OPENIMSDKViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ - (void)callback {
NSLog(@"onRecvGroupReadReceipt:%@", msgReceiptList);
} onRecvNewMessage:^(OIMMessageInfo * _Nullable message) {

} onNewRecvMessageRevoked:^(NSArray<OIMMessageRevoked *> * _Nullable msgRovoked) {
} onNewRecvMessageRevoked:^(OIMMessageRevoked * _Nullable msgRovoked) {

}];
}
Expand Down
6 changes: 4 additions & 2 deletions OpenIMSDK/Callbacker/OIMCallbacker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ typedef void (^OIMMessagesInfoCallback)(NSArray <OIMMessageInfo *> * _Nullable m
typedef void (^OIMMessageSearchCallback)(OIMSearchResultInfo * _Nullable result);

typedef void (^OIMReceiptCallback)(NSArray <OIMReceiptInfo *> * _Nullable msgReceiptList);
typedef void (^OIMRevokedCallback)(NSArray <OIMMessageRevoked *> * _Nullable msgRovoked);
typedef void (^OIMRevokedCallback)(OIMMessageRevoked * _Nullable msgRovoked);

typedef void (^OIMSignalingInvitationCallback)(OIMSignalingInfo * _Nullable result);
typedef void (^OIMSignalingResultCallback)(OIMInvitationResultInfo * _Nullable result);
Expand All @@ -74,6 +74,8 @@ typedef void (^OIMDepartmentMemberAndSubInfoCallback)(OIMDepartmentMemberAndSubI

typedef void (^OIMMomentsInfoCallback)(NSArray <OIMMomentsInfo *> * _Nullable items);

typedef void (^OIMGetAdvancedHistoryMessageListCallback)(OIMGetAdvancedHistoryMessageListInfo * _Nullable result);

/// IMSDK 主核心回调
@protocol OIMSDKListener <NSObject>
@optional
Expand Down Expand Up @@ -270,7 +272,7 @@ typedef void (^OIMMomentsInfoCallback)(NSArray <OIMMomentsInfo *> * _Nullable it
*/
- (void)onRecvMessageRevoked:(NSString *)msgID;

- (void)onNewRecvMessageRevoked:(NSString *)messageRevoked;
- (void)onNewRecvMessageRevoked:(OIMMessageRevoked *)messageRevoked;

@end

Expand Down
4 changes: 2 additions & 2 deletions OpenIMSDK/Interface/OIMManager+Group.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ NS_ASSUME_NONNULL_BEGIN
onFailure:(nullable OIMFailureCallback)onFailure;

/*
* 静音或取消禁言某群成员 mutedSeconds为0时取消禁言
* 禁言或取消禁言某群成员 mutedSeconds为0时取消禁言
*/
- (void)changeGroupMemberMute:(NSString *)groupID
userID:(NSString *)userID
Expand All @@ -201,7 +201,7 @@ NS_ASSUME_NONNULL_BEGIN
onFailure:(nullable OIMFailureCallback)onFailure;

/*
* 静音或取消禁言某群
* 禁言或取消禁言某群
*/
- (void)changeGroupMute:(NSString *)groupID
isMute:(BOOL)isMute
Expand Down
8 changes: 8 additions & 0 deletions OpenIMSDK/Interface/OIMManager+Message.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@ NS_ASSUME_NONNULL_BEGIN
- (void)setGlobalRecvMessageOpt:(OIMReceiveMessageOpt)opt
onSuccess:(nullable OIMSuccessCallback)onSuccess
onFailure:(nullable OIMFailureCallback)onFailure;

/**
* Advanced Message 系列使用
@param opts lastMinSeq 是上一次拉取回调给的值，上下文，第二次拉取需要回传
*/
- (void)getAdvancedHistoryMessageList:(OIMGetAdvancedHistoryMessageListParam *)opts
onSuccess:(nullable OIMGetAdvancedHistoryMessageListCallback)onSuccess
onFailure:(nullable OIMFailureCallback)onFailure;
@end

NS_ASSUME_NONNULL_END
12 changes: 12 additions & 0 deletions OpenIMSDK/Interface/OIMManager+Message.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,4 +474,16 @@ - (void)setGlobalRecvMessageOpt:(OIMReceiveMessageOpt)opt
Open_im_sdkSetGlobalRecvMessageOpt(callback, [self operationId], opt);
}

- (void)getAdvancedHistoryMessageList:(OIMGetAdvancedHistoryMessageListParam *)opts
onSuccess:(OIMGetAdvancedHistoryMessageListCallback)onSuccess
onFailure:(OIMFailureCallback)onFailure {
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:^(NSString * _Nullable data) {
if (onSuccess) {
onSuccess([OIMGetAdvancedHistoryMessageListInfo mj_objectWithKeyValues:data]);
}
} onFailure:onFailure];

Open_im_sdkGetAdvancedHistoryMessageList(callback, [self operationId], opts.mj_JSONString);
}

@end
1 change: 1 addition & 0 deletions OpenIMSDK/Model/OIMAttachedInfoElem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN

@property (nonatomic, assign) NSInteger hasReadCount;

// 发送此条消息时的群人数
@property (nonatomic, assign) NSInteger groupMemberCount;

@end
Expand Down
2 changes: 1 addition & 1 deletion OpenIMSDK/Model/OIMGroupInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger createTime;
@property (nonatomic, assign) NSInteger memberCount;
/// 群状态：0正常，1被封，2解散，3禁言
@property (nonatomic, assign) NSInteger status;
@property (nonatomic, assign) OIMGroupStatus status;
@property (nonatomic, copy) NSString *creatorUserID;
@property (nonatomic, assign) NSInteger needVerification;
@property (nonatomic, assign) NSInteger lookMemberInfo;
Expand Down
2 changes: 1 addition & 1 deletion OpenIMSDK/Model/OIMGroupMemberInfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) OIMJoinType joinSource;
// 操作者id
@property (nonatomic, nullable, copy) NSString *operatorUserID;
// 禁言时间s
// 被禁言结束时间戳s
@property (nonatomic, assign) NSTimeInterval muteEndTime;

@property (nonatomic, copy) NSString *inviterUserID;
Expand Down
Loading

0 comments on commit 93d7a15

Please sign in to comment.