Просмотр исходного кода

1.16系统下旋转屏幕逻辑修改。
2.更新RTC sdk

Steven 2 лет назад
Родитель
Сommit
31555252f6
100 измененных файлов с 4154 добавлено и 3600 удалено
  1. 2 2
      KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj
  2. BIN
      KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate
  3. 10 10
      KulexiuForStudent/KulexiuForStudent/Module/Classroom/Controller/NewClassRoomViewController.m
  4. 13 13
      KulexiuForStudent/KulexiuForStudent/Module/Classroom/View/MainContainer/ClassroomMainContainer.m
  5. 5 5
      KulexiuForStudent/KulexiuForStudent/Module/SealClass/Sections/Classroom/View/MainContainer/MainContainerView.m
  6. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/SealClass/Sections/Classroom/View/MainContainer/VideoMaskView.m
  7. 4 4
      KulexiuForStudent/Podfile
  8. 32 35
      KulexiuForStudent/Podfile.lock
  9. 32 35
      KulexiuForStudent/Pods/Manifest.lock
  10. 2340 2320
      KulexiuForStudent/Pods/Pods.xcodeproj/project.pbxproj
  11. 8 8
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/Info.plist
  12. 50 29
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/Headers/RCChatRoomClient.h
  13. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/Info.plist
  14. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/RongChatRoom
  15. 4 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/_CodeSignature/CodeResources
  16. 50 29
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/Headers/RCChatRoomClient.h
  17. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/Info.plist
  18. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/RongChatRoom
  19. 4 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/_CodeSignature/CodeResources
  20. 8 8
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/Info.plist
  21. 21 17
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/Headers/RCCustomerServiceClient.h
  22. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/Info.plist
  23. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/RongCustomerService
  24. 4 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/_CodeSignature/CodeResources
  25. 21 17
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/Headers/RCCustomerServiceClient.h
  26. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/Info.plist
  27. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/RongCustomerService
  28. 4 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/_CodeSignature/CodeResources
  29. 2 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/Headers/RCDiscussion.h
  30. 19 16
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/Headers/RCDiscussionClient.h
  31. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/Info.plist
  32. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/RongDiscussion
  33. 7 7
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/_CodeSignature/CodeResources
  34. 2 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/Headers/RCDiscussion.h
  35. 19 16
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/Headers/RCDiscussionClient.h
  36. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/Info.plist
  37. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/RongDiscussion
  38. 7 7
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/_CodeSignature/CodeResources
  39. 8 8
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/Info.plist
  40. 10 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h
  41. 17 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCConversationModel.h
  42. 14 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCConversationViewController.h
  43. 28 28
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCIM+Deprecated.h
  44. 8 8
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCIM.h
  45. 1 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCKitUIConf.h
  46. 3 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RongIMKit.h
  47. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Info.plist
  48. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/RongIMKit
  49. 37 22
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/_CodeSignature/CodeResources
  50. 10 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h
  51. 17 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCConversationModel.h
  52. 14 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCConversationViewController.h
  53. 28 28
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCIM+Deprecated.h
  54. 8 8
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCIM.h
  55. 1 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCKitUIConf.h
  56. 3 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RongIMKit.h
  57. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Info.plist
  58. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/RongIMKit
  59. 37 22
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/_CodeSignature/CodeResources
  60. 232 183
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/Headers/RCIMClient.h
  61. 0 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/Headers/RongIMLibHeader.h
  62. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/Info.plist
  63. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/RongIMLib
  64. 7 7
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/_CodeSignature/CodeResources
  65. 232 183
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/Headers/RCIMClient.h
  66. 0 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/Headers/RongIMLibHeader.h
  67. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/Info.plist
  68. BIN
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/RongIMLib
  69. 7 7
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/_CodeSignature/CodeResources
  70. 8 8
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/Info.plist
  71. 5 3
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCAMRDataConverter.h
  72. 34 27
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCAndroidConfig.h
  73. 20 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCBlockedMessageInfo.h
  74. 203 178
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCChannelClient.h
  75. 5 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCCommandMessage.h
  76. 5 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCCommandNotificationMessage.h
  77. 4 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCContactNotificationMessage.h
  78. 31 12
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversation.h
  79. 61 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversationChannelProtocol.h
  80. 11 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversationStatusInfo.h
  81. 1 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversationTagInfo.h
  82. 239 174
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCCoreClient.h
  83. 4 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCDownloadItem.h
  84. 8 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCFileMessage.h
  85. 6 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCFileUtility.h
  86. 9 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCFwLog.h
  87. 5 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroup.h
  88. 3 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupMessageReaderV2.h
  89. 7 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupReadReceiptInfoV2.h
  90. 11 6
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupReadReceiptV2Manager.h
  91. 5 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupReadReceiptV2Protocol.h
  92. 2 2
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCHistoryMessageOption.h
  93. 10 6
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCIMClientProtocol.h
  94. 13 6
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCImageMessage.h
  95. 4 1
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCInformationNotificationMessage.h
  96. 6 3
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMediaMessageContent.h
  97. 7 4
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMentionedInfo.h
  98. 18 13
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMessage.h
  99. 3 0
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMessageConfig.h
  100. 12 7
      KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMessageContent.h

+ 2 - 2
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -5448,10 +5448,10 @@
 		BCB634B627F6D2A300ACFDCF /* VideoList */ = {
 			isa = PBXGroup;
 			children = (
-				BCB634B727F6D2A300ACFDCF /* VideoListCell.m */,
-				BCB634B827F6D2A300ACFDCF /* VideoListView.m */,
 				BCB634B927F6D2A300ACFDCF /* VideoListCell.h */,
+				BCB634B727F6D2A300ACFDCF /* VideoListCell.m */,
 				BCB634BA27F6D2A300ACFDCF /* VideoListView.h */,
+				BCB634B827F6D2A300ACFDCF /* VideoListView.m */,
 			);
 			path = VideoList;
 			sourceTree = "<group>";

BIN
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 10 - 10
KulexiuForStudent/KulexiuForStudent/Module/Classroom/Controller/NewClassRoomViewController.m

@@ -932,8 +932,8 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
 - (CGRect)mainContainerViewFrame {
     CGFloat x = iPhoneXSafeTopMargin;
     CGFloat y = 0;
-    CGFloat width = UIScreenWidth - x - iPhoneXSafeBottomMargin;
-    CGFloat height = UIScreenHeight - y;
+    CGFloat width = KLandscapeWidth - x - iPhoneXSafeBottomMargin;
+    CGFloat height = KLandscapeHeight - y;
     return CGRectMake(x, y, width, height);
 }
 
@@ -1201,7 +1201,7 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
 
 - (UILabel *)timeLabel {
     if (!_timeLabel) {
-        _timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kScreenWidth - self.videoListView.width - 40 - TTimeLableWidth - iPhoneXSafeBottomMargin, 25, TTimeLableWidth, TTimeLableHeight)];
+        _timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(KLandscapeWidth - self.videoListView.width - 40 - TTimeLableWidth - iPhoneXSafeBottomMargin, 25, TTimeLableWidth, TTimeLableHeight)];
         _timeLabel.font = [UIFont systemFontOfSize:16];
         _timeLabel.textAlignment = NSTextAlignmentRight;
         _timeLabel.textColor = HexRGB(0xFF5500);
@@ -1217,7 +1217,7 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
 
 - (ClassTitleView *)titleView {
     if (!_titleView) {
-        _titleView = [[ClassTitleView alloc] initWithFrame:CGRectMake(iPhoneXSafeTopMargin, 0, kScreenWidth - iPhoneXSafeTopMargin - iPhoneXSafeBottomMargin, TitleViewHeight)];
+        _titleView = [[ClassTitleView alloc] initWithFrame:CGRectMake(iPhoneXSafeTopMargin, 0, KLandscapeWidth - iPhoneXSafeTopMargin - iPhoneXSafeBottomMargin, TitleViewHeight)];
     }
     return _titleView;
 }
@@ -1226,12 +1226,12 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
     if(!_videoListView) {
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
-        height = kScreenHeight - 10;
+        height = KLandscapeHeight - 10;
         width = height / 3.0f * 4;
-        if (width > kScreenWidth - 160) {
-            width = kScreenWidth - 160;
+        if (width > KLandscapeWidth - 160) {
+            width = KLandscapeWidth - 160;
         }
-        _videoListView = [[ClassVideoListView alloc] initWithFrame:CGRectMake(width + iPhoneXSafeTopMargin + 5, 10, kScreenWidth -  (width + 10 + iPhoneXSafeTopMargin) - iPhoneXSafeBottomMargin, height)];
+        _videoListView = [[ClassVideoListView alloc] initWithFrame:CGRectMake(width + iPhoneXSafeTopMargin + 5, 10, KLandscapeWidth -  (width + 10 + iPhoneXSafeTopMargin) - iPhoneXSafeBottomMargin, height)];
         _videoListView.delegate = self;
     }
     return _videoListView;
@@ -1247,7 +1247,7 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
 
 - (ChatAreaView *)chatAreaView {
     if(!_chatAreaView) {
-        _chatAreaView = [[ChatAreaView alloc] initWithFrame:CGRectMake(kScreenWidth - iPhoneXSafeBottomMargin - 300,0, 300, UIScreenHeight) conversationType:ConversationType_GROUP targetId:[ClassroomService sharedService].currentRoom.roomId];
+        _chatAreaView = [[ChatAreaView alloc] initWithFrame:CGRectMake(KLandscapeWidth - iPhoneXSafeBottomMargin - 300,0, 300, KLandscapeHeight) conversationType:ConversationType_GROUP targetId:[ClassroomService sharedService].currentRoom.roomId];
     }
     return _chatAreaView;
 }
@@ -1330,7 +1330,7 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
 
 - (UILabel *)networkLabel {
     if (!_networkLabel) {
-        _networkLabel = [[UILabel alloc] initWithFrame:CGRectMake((kScreenWidth - 200) / 2.0f, (kScreenHeight - 60) / 2.0f, 200, 60)];
+        _networkLabel = [[UILabel alloc] initWithFrame:CGRectMake((KLandscapeWidth - 200) / 2.0f, (KLandscapeHeight - 60) / 2.0f, 200, 60)];
         _networkLabel.backgroundColor = HexRGBAlpha(0x000000, 0.8f);
         _networkLabel.textColor = HexRGB(0xffffff);
         _networkLabel.textAlignment = NSTextAlignmentCenter;

+ 13 - 13
KulexiuForStudent/KulexiuForStudent/Module/Classroom/View/MainContainer/ClassroomMainContainer.m

@@ -109,13 +109,13 @@
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
         
-        height = kScreen_Width / 4.0f * 3;
-        if (height > kScreenHeight) {
-            height = kScreenHeight;
+        height = KLandscapeWidth / 4.0f * 3;
+        if (height > KLandscapeHeight) {
+            height = KLandscapeHeight;
         }
         width = height / 3.0f * 4;
 
-        self.videoView.frame = CGRectMake((kScreenWidth - width) / 2.0f, 0, width, height);
+        self.videoView.frame = CGRectMake((KLandscapeWidth - width) / 2.0f, 0, width, height);
     }else {
         [self.videoBackView removeFromSuperview];
         [self addSubview:self.videoBackView];
@@ -130,10 +130,10 @@
     if (!_videoBackView) {
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
-        height = kScreenHeight - 20;
+        height = KLandscapeHeight - 20;
         width = height / 3.0f * 4;
-        if (width > kScreenWidth - 180) {
-            width = kScreenWidth - 180;
+        if (width > KLandscapeWidth - 180) {
+            width = KLandscapeWidth - 180;
             height = width / 4.0f * 3;
         }
         _videoBackView = [[UIView alloc] initWithFrame:CGRectMake(10, 10, width, height)];
@@ -147,10 +147,10 @@
     if(!_videoView) {
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
-        height = kScreenHeight - 20;
+        height = KLandscapeHeight - 20;
         width = height / 3.0f * 4;
-        if (width > kScreenWidth - 180) {
-            width = kScreenWidth - 180;
+        if (width > KLandscapeWidth - 180) {
+            width = KLandscapeWidth - 180;
             height = width / 4.0f * 3;
         }
         _videoView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
@@ -162,10 +162,10 @@
     if (!_emptyView) {
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
-        height = kScreenHeight - 20;
+        height = KLandscapeHeight - 20;
         width = height / 3.0f * 4;
-        if (width > kScreenWidth - 180) {
-            width = kScreenWidth - 180;
+        if (width > KLandscapeWidth - 180) {
+            width = KLandscapeWidth - 180;
             height = width / 4.0f * 3;
         }
         _emptyView = [[EmptyView alloc] initWithFrame:CGRectMake(10, 10, width, height) role:[ClassroomService sharedService].currentRoom.currentMember.role];

+ 5 - 5
KulexiuForStudent/KulexiuForStudent/Module/SealClass/Sections/Classroom/View/MainContainer/MainContainerView.m

@@ -108,15 +108,15 @@
         [self.superview bringSubviewToFront:self.videoBackView];
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
-        height = kScreen_Width / 4.0f * 3;
-        if (height > kScreenHeight) {
-            height = kScreenHeight;
+        height = KLandscapeWidth / 4.0f * 3;
+        if (height > KLandscapeHeight) {
+            height = KLandscapeHeight;
             width = height / 3.0f * 4;
         }
         else {
-            width = kScreenHeight;
+            width = KLandscapeHeight;
         }
-        self.videoView.frame = CGRectMake((kScreenWidth - width) / 2.0f, 0, width, height);
+        self.videoView.frame = CGRectMake((KLandscapeWidth - width) / 2.0f, 0, width, height);
     }else {
         [self.videoBackView removeFromSuperview];
         [self addSubview:self.videoBackView];

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/SealClass/Sections/Classroom/View/MainContainer/VideoMaskView.m

@@ -54,13 +54,13 @@
         CGPoint center = self.center;
         CGFloat width = 0.0f;
         CGFloat height = 0.0f;
-        height = kScreen_Width / 4.0f * 3;
-        if (height > kScreenHeight) {
-            height = kScreenHeight;
+        height = KLandscapeWidth / 4.0f * 3;
+        if (height > KLandscapeHeight) {
+            height = KLandscapeHeight;
             width = height / 3.0f * 4;
         }
         else {
-            width = kScreenHeight;
+            width = KLandscapeHeight;
         }
         _maskVideoView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, height)];
         _maskVideoView.center = center;

+ 4 - 4
KulexiuForStudent/Podfile

@@ -39,10 +39,10 @@ target 'KulexiuForStudent' do
   
   pod 'SSZipArchive'
   pod 'SocketRocket'
-  pod 'RongCloudIM/IMLib',  '~> 5.2.3'
-  pod 'RongCloudIM/IMKit',  '~> 5.2.3'
-  pod 'RongCloudIM/Sight',  '~> 5.2.3'
-  pod 'RongCloudRTC/RongRTCLib', '~> 5.2.3'
+  pod 'RongCloudIM/IMLib',  '~> 5.2.5'
+  pod 'RongCloudIM/IMKit',  '~> 5.2.5'
+  pod 'RongCloudIM/Sight',  '~> 5.2.5'
+  pod 'RongCloudRTC/RongRTCLib', '~> 5.2.5'
 
   pod "iOS-KS3SDK", "~>1.0.5"
 #  pod "WechatOpenSDK"

+ 32 - 35
KulexiuForStudent/Podfile.lock

@@ -45,32 +45,29 @@ PODS:
   - MBProgressHUD (1.2.0)
   - MJExtension (3.3.0)
   - MJRefresh (3.1.17)
-  - NTLBridge (3.1.2)
+  - NTLBridge (3.1.4)
   - Reachability (3.2)
-  - RongCloudIM/ChatRoom (5.2.3):
+  - RongCloudIM/ChatRoom (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/CustomerService (5.2.3):
+  - RongCloudIM/CustomerService (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/Discussion (5.2.3):
+  - RongCloudIM/Discussion (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/IMKit (5.2.3):
+  - RongCloudIM/IMKit (5.2.5):
     - RongCloudIM/IMLib
-  - RongCloudIM/IMLib (5.2.3):
+  - RongCloudIM/IMLib (5.2.5):
     - RongCloudIM/ChatRoom
     - RongCloudIM/CustomerService
     - RongCloudIM/Discussion
     - RongCloudIM/IMLibCore
-    - RongCloudIM/Location
     - RongCloudIM/PublicService
-  - RongCloudIM/IMLibCore (5.2.3)
-  - RongCloudIM/Location (5.2.3):
+  - RongCloudIM/IMLibCore (5.2.5)
+  - RongCloudIM/PublicService (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/PublicService (5.2.3):
-    - RongCloudIM/IMLibCore
-  - RongCloudIM/Sight (5.2.3):
+  - RongCloudIM/Sight (5.2.5):
     - RongCloudIM/IMKit
-  - RongCloudRTC/RongRTCLib (5.2.3):
-    - RongCloudIM/IMLibCore (>= 5.1.3)
+  - RongCloudRTC/RongRTCLib (5.2.5):
+    - RongCloudIM/IMLibCore (>= 5.2.5)
   - RSKImageCropper (3.0.2)
   - SDWebImage (5.12.5):
     - SDWebImage/Core (= 5.12.5)
@@ -78,25 +75,25 @@ PODS:
   - SocketRocket (0.6.0)
   - SSZipArchive (2.4.3)
   - TYCyclePagerView (1.2.0)
-  - Whiteboard (2.16.27):
-    - Whiteboard/Whiteboard-YYModel (= 2.16.27)
-  - Whiteboard/Base (2.16.27):
-    - NTLBridge (~> 3.1.2)
+  - Whiteboard (2.16.39):
+    - Whiteboard/Whiteboard-YYModel (= 2.16.39)
+  - Whiteboard/Base (2.16.39):
+    - NTLBridge (~> 3.1.4)
     - Whiteboard/Object
-  - Whiteboard/Converter (2.16.27):
+  - Whiteboard/Converter (2.16.39):
     - Whiteboard/Object
-  - Whiteboard/Model (2.16.27):
+  - Whiteboard/Model (2.16.39):
     - YYModel
-  - Whiteboard/NativeReplayer (2.16.27):
+  - Whiteboard/NativeReplayer (2.16.39):
     - Whiteboard/Replayer
-  - Whiteboard/Object (2.16.27):
+  - Whiteboard/Object (2.16.39):
     - Whiteboard/Model
-  - Whiteboard/Replayer (2.16.27):
+  - Whiteboard/Replayer (2.16.39):
     - Whiteboard/Base
-  - Whiteboard/Resource (2.16.27)
-  - Whiteboard/Room (2.16.27):
+  - Whiteboard/Resource (2.16.39)
+  - Whiteboard/Room (2.16.39):
     - Whiteboard/Base
-  - Whiteboard/Whiteboard-YYModel (2.16.27):
+  - Whiteboard/Whiteboard-YYModel (2.16.39):
     - Whiteboard/Converter
     - Whiteboard/NativeReplayer
     - Whiteboard/Resource
@@ -121,10 +118,10 @@ DEPENDENCIES:
   - MJExtension (~> 3.3.0)
   - MJRefresh (~> 3.1.12)
   - Reachability (~> 3.2)
-  - RongCloudIM/IMKit (~> 5.2.3)
-  - RongCloudIM/IMLib (~> 5.2.3)
-  - RongCloudIM/Sight (~> 5.2.3)
-  - RongCloudRTC/RongRTCLib (~> 5.2.3)
+  - RongCloudIM/IMKit (~> 5.2.5)
+  - RongCloudIM/IMLib (~> 5.2.5)
+  - RongCloudIM/Sight (~> 5.2.5)
+  - RongCloudRTC/RongRTCLib (~> 5.2.5)
   - RSKImageCropper
   - SDWebImage (~> 5.12.5)
   - SocketRocket
@@ -179,19 +176,19 @@ SPEC CHECKSUMS:
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   MJExtension: 01704cca2b60a214c10761b6491eab74069d68a9
   MJRefresh: ee5b68f639775462faba4db0fd243baf4d42c2cf
-  NTLBridge: b3433dc0dbe85c803e92a742328dc3119e331ed3
+  NTLBridge: 49780dc966976d3221a0eb03c7368617c1987cb6
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  RongCloudIM: be2941344f84bfa7ec6ea60e6379333a652bd8e3
-  RongCloudRTC: 6b9921f0680b2d95742e21210ef6eb79722a2dd8
+  RongCloudIM: 4c3befbe6e9dd813a87c499c81fb2eac54c354b3
+  RongCloudRTC: 4ddffa66488977243b32e92923f03af9423b4f29
   RSKImageCropper: 1ac71e9a82e3f41eea3eedfff8eacb0d3821c9ec
   SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TYCyclePagerView: 2b051dade0615c70784aa34f40c646feeddb7344
-  Whiteboard: dc3d59f1f826e6065bd054bf499650c829753aff
+  Whiteboard: 4622f3866b7c35a9c757955619ba0a2b26d968f5
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
   ZKCycleScrollView: 4b353d17b7f469b245a1c606d5a977e72b940895
 
-PODFILE CHECKSUM: 28f510ae92245be7584827cb59d802d1b134773b
+PODFILE CHECKSUM: 91b204a946d66914675de95cadc9a38a9c35beb1
 
 COCOAPODS: 1.11.3

+ 32 - 35
KulexiuForStudent/Pods/Manifest.lock

@@ -45,32 +45,29 @@ PODS:
   - MBProgressHUD (1.2.0)
   - MJExtension (3.3.0)
   - MJRefresh (3.1.17)
-  - NTLBridge (3.1.2)
+  - NTLBridge (3.1.4)
   - Reachability (3.2)
-  - RongCloudIM/ChatRoom (5.2.3):
+  - RongCloudIM/ChatRoom (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/CustomerService (5.2.3):
+  - RongCloudIM/CustomerService (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/Discussion (5.2.3):
+  - RongCloudIM/Discussion (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/IMKit (5.2.3):
+  - RongCloudIM/IMKit (5.2.5):
     - RongCloudIM/IMLib
-  - RongCloudIM/IMLib (5.2.3):
+  - RongCloudIM/IMLib (5.2.5):
     - RongCloudIM/ChatRoom
     - RongCloudIM/CustomerService
     - RongCloudIM/Discussion
     - RongCloudIM/IMLibCore
-    - RongCloudIM/Location
     - RongCloudIM/PublicService
-  - RongCloudIM/IMLibCore (5.2.3)
-  - RongCloudIM/Location (5.2.3):
+  - RongCloudIM/IMLibCore (5.2.5)
+  - RongCloudIM/PublicService (5.2.5):
     - RongCloudIM/IMLibCore
-  - RongCloudIM/PublicService (5.2.3):
-    - RongCloudIM/IMLibCore
-  - RongCloudIM/Sight (5.2.3):
+  - RongCloudIM/Sight (5.2.5):
     - RongCloudIM/IMKit
-  - RongCloudRTC/RongRTCLib (5.2.3):
-    - RongCloudIM/IMLibCore (>= 5.1.3)
+  - RongCloudRTC/RongRTCLib (5.2.5):
+    - RongCloudIM/IMLibCore (>= 5.2.5)
   - RSKImageCropper (3.0.2)
   - SDWebImage (5.12.5):
     - SDWebImage/Core (= 5.12.5)
@@ -78,25 +75,25 @@ PODS:
   - SocketRocket (0.6.0)
   - SSZipArchive (2.4.3)
   - TYCyclePagerView (1.2.0)
-  - Whiteboard (2.16.27):
-    - Whiteboard/Whiteboard-YYModel (= 2.16.27)
-  - Whiteboard/Base (2.16.27):
-    - NTLBridge (~> 3.1.2)
+  - Whiteboard (2.16.39):
+    - Whiteboard/Whiteboard-YYModel (= 2.16.39)
+  - Whiteboard/Base (2.16.39):
+    - NTLBridge (~> 3.1.4)
     - Whiteboard/Object
-  - Whiteboard/Converter (2.16.27):
+  - Whiteboard/Converter (2.16.39):
     - Whiteboard/Object
-  - Whiteboard/Model (2.16.27):
+  - Whiteboard/Model (2.16.39):
     - YYModel
-  - Whiteboard/NativeReplayer (2.16.27):
+  - Whiteboard/NativeReplayer (2.16.39):
     - Whiteboard/Replayer
-  - Whiteboard/Object (2.16.27):
+  - Whiteboard/Object (2.16.39):
     - Whiteboard/Model
-  - Whiteboard/Replayer (2.16.27):
+  - Whiteboard/Replayer (2.16.39):
     - Whiteboard/Base
-  - Whiteboard/Resource (2.16.27)
-  - Whiteboard/Room (2.16.27):
+  - Whiteboard/Resource (2.16.39)
+  - Whiteboard/Room (2.16.39):
     - Whiteboard/Base
-  - Whiteboard/Whiteboard-YYModel (2.16.27):
+  - Whiteboard/Whiteboard-YYModel (2.16.39):
     - Whiteboard/Converter
     - Whiteboard/NativeReplayer
     - Whiteboard/Resource
@@ -121,10 +118,10 @@ DEPENDENCIES:
   - MJExtension (~> 3.3.0)
   - MJRefresh (~> 3.1.12)
   - Reachability (~> 3.2)
-  - RongCloudIM/IMKit (~> 5.2.3)
-  - RongCloudIM/IMLib (~> 5.2.3)
-  - RongCloudIM/Sight (~> 5.2.3)
-  - RongCloudRTC/RongRTCLib (~> 5.2.3)
+  - RongCloudIM/IMKit (~> 5.2.5)
+  - RongCloudIM/IMLib (~> 5.2.5)
+  - RongCloudIM/Sight (~> 5.2.5)
+  - RongCloudRTC/RongRTCLib (~> 5.2.5)
   - RSKImageCropper
   - SDWebImage (~> 5.12.5)
   - SocketRocket
@@ -179,19 +176,19 @@ SPEC CHECKSUMS:
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   MJExtension: 01704cca2b60a214c10761b6491eab74069d68a9
   MJRefresh: ee5b68f639775462faba4db0fd243baf4d42c2cf
-  NTLBridge: b3433dc0dbe85c803e92a742328dc3119e331ed3
+  NTLBridge: 49780dc966976d3221a0eb03c7368617c1987cb6
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  RongCloudIM: be2941344f84bfa7ec6ea60e6379333a652bd8e3
-  RongCloudRTC: 6b9921f0680b2d95742e21210ef6eb79722a2dd8
+  RongCloudIM: 4c3befbe6e9dd813a87c499c81fb2eac54c354b3
+  RongCloudRTC: 4ddffa66488977243b32e92923f03af9423b4f29
   RSKImageCropper: 1ac71e9a82e3f41eea3eedfff8eacb0d3821c9ec
   SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TYCyclePagerView: 2b051dade0615c70784aa34f40c646feeddb7344
-  Whiteboard: dc3d59f1f826e6065bd054bf499650c829753aff
+  Whiteboard: 4622f3866b7c35a9c757955619ba0a2b26d968f5
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
   ZKCycleScrollView: 4b353d17b7f469b245a1c606d5a977e72b940895
 
-PODFILE CHECKSUM: 28f510ae92245be7584827cb59d802d1b134773b
+PODFILE CHECKSUM: 91b204a946d66914675de95cadc9a38a9c35beb1
 
 COCOAPODS: 1.11.3

Разница между файлами не показана из-за своего большого размера
+ 2340 - 2320
KulexiuForStudent/Pods/Pods.xcodeproj/project.pbxproj


+ 8 - 8
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/Info.plist

@@ -6,31 +6,31 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_armv7</string>
 			<key>LibraryPath</key>
 			<string>RongChatRoom.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>i386</string>
-				<string>x86_64</string>
+				<string>arm64</string>
+				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>ios-i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>RongChatRoom.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
-				<string>armv7</string>
+				<string>i386</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

+ 50 - 29
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/Headers/RCChatRoomClient.h

@@ -38,8 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)joinChatRoom:(NSString *)targetId
         messageCount:(int)messageCount
-             success:(void (^)(void))successBlock
-               error:(void (^)(RCErrorCode status))errorBlock;
+             success:(nullable void (^)(void))successBlock
+               error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  加入已经存在的聊天室(如果聊天室不存在返回错误 23410,人数超限返回错误 23411)
@@ -66,8 +66,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)joinExistChatRoom:(NSString *)targetId
              messageCount:(int)messageCount
-                  success:(void (^)(void))successBlock
-                    error:(void (^)(RCErrorCode status))errorBlock;
+                  success:(nullable void (^)(void))successBlock
+                    error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  退出聊天室
@@ -80,8 +80,8 @@ NS_ASSUME_NONNULL_BEGIN
  @remarks 聊天室
  */
 - (void)quitChatRoom:(NSString *)targetId
-             success:(void (^)(void))successBlock
-               error:(void (^)(RCErrorCode status))errorBlock;
+             success:(nullable void (^)(void))successBlock
+               error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  获取聊天室的信息(包含部分成员信息和当前聊天室中的成员总数)
@@ -104,8 +104,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getChatRoomInfo:(NSString *)targetId
                   count:(int)count
                   order:(RCChatRoomMemberOrder)order
-                success:(void (^)(RCChatRoomInfo *chatRoomInfo))successBlock
-                  error:(void (^)(RCErrorCode status))errorBlock;
+                success:(nullable void (^)(RCChatRoomInfo *chatRoomInfo))successBlock
+                  error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  设置 IMLib 的聊天室状态监听器
@@ -117,6 +117,27 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setChatRoomStatusDelegate:(id<RCChatRoomStatusDelegate>)delegate;
 
 /*!
+ 添加 IMLib 的聊天室状态监听器
+
+ @param delegate IMLib 聊天室状态监听器
+ */
+- (void)addChatRoomStatusDelegate:(id<RCChatRoomStatusDelegate>)delegate;
+
+/*!
+ 移除 IMLib 的聊天室状态监听器
+
+ @param delegate IMLib 聊天室状态监听器
+ */
+- (void)removeChatRoomStatusDelegate:(id<RCChatRoomStatusDelegate>)delegate;
+
+/*!
+ 获取 IMLib 的聊天室状态监听器
+ 
+ @return 所有 IMLib 聊天室状态监听器
+ */
+- (NSArray <id<RCChatRoomStatusDelegate>> *)allChatRoomStatusDelegates;
+
+/*!
  从服务器端获取聊天室的历史消息
  @param targetId            聊天室ID
  @param recordTime          起始的消息发送时间戳,毫秒
@@ -134,8 +155,8 @@ NS_ASSUME_NONNULL_BEGIN
                               recordTime:(long long)recordTime
                                    count:(int)count
                                    order:(RCTimestampOrder)order
-                                 success:(void (^)(NSArray<RCMessage *> *messages, long long syncTime))successBlock
-                                   error:(void (^)(RCErrorCode status))errorBlock;
+                                 success:(nullable void (^)(NSArray<RCMessage *> *messages, long long syncTime))successBlock
+                                   error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 #pragma mark - 聊天室状态存储 (使用前必须先联系商务开通)
 /*!
@@ -197,8 +218,8 @@ NS_ASSUME_NONNULL_BEGIN
         sendNotification:(BOOL)sendNotification
               autoDelete:(BOOL)autoDelete
        notificationExtra:(NSString *)notificationExtra
-                 success:(void (^)(void))successBlock
-                   error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                 success:(nullable void (^)(void))successBlock
+                   error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  强制设置聊天室自定义属性
@@ -224,8 +245,8 @@ NS_ASSUME_NONNULL_BEGIN
              sendNotification:(BOOL)sendNotification
                    autoDelete:(BOOL)autoDelete
             notificationExtra:(NSString *)notificationExtra
-                      success:(void (^)(void))successBlock
-                        error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                      success:(nullable void (^)(void))successBlock
+                        error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  批量设置聊天室自定义属性
@@ -245,8 +266,8 @@ NS_ASSUME_NONNULL_BEGIN
                    entries:(NSDictionary<NSString *, NSString *> *)entries
                    isForce:(BOOL)isForce
                 autoDelete:(BOOL)autoDelete
-                   success:(void (^)(void))successBlock
-                     error:(void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *,NSNumber *> *failureEntries))errorBlock;
+                   success:(nullable void (^)(void))successBlock
+                     error:(nullable void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *,NSNumber *> *failureEntries))errorBlock;
 
 /**
  获取聊天室单个属性
@@ -262,8 +283,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)getChatRoomEntry:(NSString *)chatroomId
                      key:(NSString *)key
-                 success:(void (^)(NSDictionary<NSString *,NSString *> *entry))successBlock
-                   error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                 success:(nullable void (^)(NSDictionary<NSString *,NSString *> *entry))successBlock
+                   error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  获取聊天室所有自定义属性
@@ -277,8 +298,8 @@ NS_ASSUME_NONNULL_BEGIN
  @remarks 聊天室
  */
 - (void)getAllChatRoomEntries:(NSString *)chatroomId
-                      success:(void (^)(NSDictionary<NSString *, NSString *> *entry))successBlock
-                        error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                      success:(nullable void (^)(NSDictionary<NSString *, NSString *> *entry))successBlock
+                        error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  删除聊天室自定义属性
@@ -300,8 +321,8 @@ NS_ASSUME_NONNULL_BEGIN
                         key:(NSString *)key
            sendNotification:(BOOL)sendNotification
           notificationExtra:(NSString *)notificationExtra
-                    success:(void (^)(void))successBlock
-                      error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                    success:(nullable void (^)(void))successBlock
+                      error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  强制删除聊天室自定义属性
@@ -323,8 +344,8 @@ NS_ASSUME_NONNULL_BEGIN
                              key:(NSString *)key
                 sendNotification:(BOOL)sendNotification
                notificationExtra:(NSString *)notificationExtra
-                         success:(void (^)(void))successBlock
-                           error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                         success:(nullable void (^)(void))successBlock
+                           error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  批量删除聊天室自定义属性
@@ -342,8 +363,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeChatRoomEntries:(NSString *)chatroomId
                          keys:(NSArray<NSString *> *)keys
                       isForce:(BOOL)isForce
-                      success:(void (^)(void))successBlock
-                        error:(void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *, NSNumber *> *failureEntries))errorBlock;
+                      success:(nullable void (^)(void))successBlock
+                        error:(nullable void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *, NSNumber *> *failureEntries))errorBlock;
 
 #pragma mark - 聊天室成员变化监听器
 
@@ -354,7 +375,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @remarks 功能设置
  */
-@property (nonatomic, weak) id<RCChatRoomMemberDelegate> memberDelegate;
+@property (nonatomic, weak, nullable) id<RCChatRoomMemberDelegate> memberDelegate;
 
 
 
@@ -365,8 +386,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param errorBlock 失败回调
 - (void)bindChatRoom:(NSString *)chatRoomId
          withRTCRoom:(NSString *)rtcRoomId
-             success:(void(^)(void))successBlock
-               error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+             success:(nullable void(^)(void))successBlock
+               error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 @end
 
 NS_ASSUME_NONNULL_END

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/RongChatRoom


+ 4 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-arm64_armv7/RongChatRoom.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/RCChatRoomClient.h</key>
 		<data>
-		ESkeGc7kJkRzwCd4xaTjJgGfIKI=
+		95x2+ttdbgpkOW+vQ3q9x2CnHeQ=
 		</data>
 		<key>Headers/RCChatRoomEnumDefine.h</key>
 		<data>
@@ -38,7 +38,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		WP9njzZiihlteTD51yIKxhubQzs=
+		zW4AriErKQ/Zw9q8qzx1p77w03s=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -51,11 +51,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ESkeGc7kJkRzwCd4xaTjJgGfIKI=
+			95x2+ttdbgpkOW+vQ3q9x2CnHeQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			Y4q5YzgfW+0eMzMNFboa3HWg+sy3OzXYN6cJQ7tuahQ=
+			l9nV49kTOTSS9haInC4zbR8gK3OztIWSToalEAicUM0=
 			</data>
 		</dict>
 		<key>Headers/RCChatRoomEnumDefine.h</key>

+ 50 - 29
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/Headers/RCChatRoomClient.h

@@ -38,8 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)joinChatRoom:(NSString *)targetId
         messageCount:(int)messageCount
-             success:(void (^)(void))successBlock
-               error:(void (^)(RCErrorCode status))errorBlock;
+             success:(nullable void (^)(void))successBlock
+               error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  加入已经存在的聊天室(如果聊天室不存在返回错误 23410,人数超限返回错误 23411)
@@ -66,8 +66,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)joinExistChatRoom:(NSString *)targetId
              messageCount:(int)messageCount
-                  success:(void (^)(void))successBlock
-                    error:(void (^)(RCErrorCode status))errorBlock;
+                  success:(nullable void (^)(void))successBlock
+                    error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  退出聊天室
@@ -80,8 +80,8 @@ NS_ASSUME_NONNULL_BEGIN
  @remarks 聊天室
  */
 - (void)quitChatRoom:(NSString *)targetId
-             success:(void (^)(void))successBlock
-               error:(void (^)(RCErrorCode status))errorBlock;
+             success:(nullable void (^)(void))successBlock
+               error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  获取聊天室的信息(包含部分成员信息和当前聊天室中的成员总数)
@@ -104,8 +104,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getChatRoomInfo:(NSString *)targetId
                   count:(int)count
                   order:(RCChatRoomMemberOrder)order
-                success:(void (^)(RCChatRoomInfo *chatRoomInfo))successBlock
-                  error:(void (^)(RCErrorCode status))errorBlock;
+                success:(nullable void (^)(RCChatRoomInfo *chatRoomInfo))successBlock
+                  error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 /*!
  设置 IMLib 的聊天室状态监听器
@@ -117,6 +117,27 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setChatRoomStatusDelegate:(id<RCChatRoomStatusDelegate>)delegate;
 
 /*!
+ 添加 IMLib 的聊天室状态监听器
+
+ @param delegate IMLib 聊天室状态监听器
+ */
+- (void)addChatRoomStatusDelegate:(id<RCChatRoomStatusDelegate>)delegate;
+
+/*!
+ 移除 IMLib 的聊天室状态监听器
+
+ @param delegate IMLib 聊天室状态监听器
+ */
+- (void)removeChatRoomStatusDelegate:(id<RCChatRoomStatusDelegate>)delegate;
+
+/*!
+ 获取 IMLib 的聊天室状态监听器
+ 
+ @return 所有 IMLib 聊天室状态监听器
+ */
+- (NSArray <id<RCChatRoomStatusDelegate>> *)allChatRoomStatusDelegates;
+
+/*!
  从服务器端获取聊天室的历史消息
  @param targetId            聊天室ID
  @param recordTime          起始的消息发送时间戳,毫秒
@@ -134,8 +155,8 @@ NS_ASSUME_NONNULL_BEGIN
                               recordTime:(long long)recordTime
                                    count:(int)count
                                    order:(RCTimestampOrder)order
-                                 success:(void (^)(NSArray<RCMessage *> *messages, long long syncTime))successBlock
-                                   error:(void (^)(RCErrorCode status))errorBlock;
+                                 success:(nullable void (^)(NSArray<RCMessage *> *messages, long long syncTime))successBlock
+                                   error:(nullable void (^)(RCErrorCode status))errorBlock;
 
 #pragma mark - 聊天室状态存储 (使用前必须先联系商务开通)
 /*!
@@ -197,8 +218,8 @@ NS_ASSUME_NONNULL_BEGIN
         sendNotification:(BOOL)sendNotification
               autoDelete:(BOOL)autoDelete
        notificationExtra:(NSString *)notificationExtra
-                 success:(void (^)(void))successBlock
-                   error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                 success:(nullable void (^)(void))successBlock
+                   error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  强制设置聊天室自定义属性
@@ -224,8 +245,8 @@ NS_ASSUME_NONNULL_BEGIN
              sendNotification:(BOOL)sendNotification
                    autoDelete:(BOOL)autoDelete
             notificationExtra:(NSString *)notificationExtra
-                      success:(void (^)(void))successBlock
-                        error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                      success:(nullable void (^)(void))successBlock
+                        error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  批量设置聊天室自定义属性
@@ -245,8 +266,8 @@ NS_ASSUME_NONNULL_BEGIN
                    entries:(NSDictionary<NSString *, NSString *> *)entries
                    isForce:(BOOL)isForce
                 autoDelete:(BOOL)autoDelete
-                   success:(void (^)(void))successBlock
-                     error:(void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *,NSNumber *> *failureEntries))errorBlock;
+                   success:(nullable void (^)(void))successBlock
+                     error:(nullable void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *,NSNumber *> *failureEntries))errorBlock;
 
 /**
  获取聊天室单个属性
@@ -262,8 +283,8 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)getChatRoomEntry:(NSString *)chatroomId
                      key:(NSString *)key
-                 success:(void (^)(NSDictionary<NSString *,NSString *> *entry))successBlock
-                   error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                 success:(nullable void (^)(NSDictionary<NSString *,NSString *> *entry))successBlock
+                   error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  获取聊天室所有自定义属性
@@ -277,8 +298,8 @@ NS_ASSUME_NONNULL_BEGIN
  @remarks 聊天室
  */
 - (void)getAllChatRoomEntries:(NSString *)chatroomId
-                      success:(void (^)(NSDictionary<NSString *, NSString *> *entry))successBlock
-                        error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                      success:(nullable void (^)(NSDictionary<NSString *, NSString *> *entry))successBlock
+                        error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  删除聊天室自定义属性
@@ -300,8 +321,8 @@ NS_ASSUME_NONNULL_BEGIN
                         key:(NSString *)key
            sendNotification:(BOOL)sendNotification
           notificationExtra:(NSString *)notificationExtra
-                    success:(void (^)(void))successBlock
-                      error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                    success:(nullable void (^)(void))successBlock
+                      error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  强制删除聊天室自定义属性
@@ -323,8 +344,8 @@ NS_ASSUME_NONNULL_BEGIN
                              key:(NSString *)key
                 sendNotification:(BOOL)sendNotification
                notificationExtra:(NSString *)notificationExtra
-                         success:(void (^)(void))successBlock
-                           error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                         success:(nullable void (^)(void))successBlock
+                           error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /**
  批量删除聊天室自定义属性
@@ -342,8 +363,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeChatRoomEntries:(NSString *)chatroomId
                          keys:(NSArray<NSString *> *)keys
                       isForce:(BOOL)isForce
-                      success:(void (^)(void))successBlock
-                        error:(void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *, NSNumber *> *failureEntries))errorBlock;
+                      success:(nullable void (^)(void))successBlock
+                        error:(nullable void (^)(RCErrorCode nErrorCode, NSDictionary<NSString *, NSNumber *> *failureEntries))errorBlock;
 
 #pragma mark - 聊天室成员变化监听器
 
@@ -354,7 +375,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @remarks 功能设置
  */
-@property (nonatomic, weak) id<RCChatRoomMemberDelegate> memberDelegate;
+@property (nonatomic, weak, nullable) id<RCChatRoomMemberDelegate> memberDelegate;
 
 
 
@@ -365,8 +386,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param errorBlock 失败回调
 - (void)bindChatRoom:(NSString *)chatRoomId
          withRTCRoom:(NSString *)rtcRoomId
-             success:(void(^)(void))successBlock
-               error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+             success:(nullable void(^)(void))successBlock
+               error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 @end
 
 NS_ASSUME_NONNULL_END

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/RongChatRoom


+ 4 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongChatRoom.xcframework/ios-i386_x86_64-simulator/RongChatRoom.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/RCChatRoomClient.h</key>
 		<data>
-		ESkeGc7kJkRzwCd4xaTjJgGfIKI=
+		95x2+ttdbgpkOW+vQ3q9x2CnHeQ=
 		</data>
 		<key>Headers/RCChatRoomEnumDefine.h</key>
 		<data>
@@ -38,7 +38,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		qsT3izmLTR6eQ7Zk6OlbPTmP94g=
+		qghAnXsMl+VQQ6CCrN44ImlFl0A=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -51,11 +51,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ESkeGc7kJkRzwCd4xaTjJgGfIKI=
+			95x2+ttdbgpkOW+vQ3q9x2CnHeQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			Y4q5YzgfW+0eMzMNFboa3HWg+sy3OzXYN6cJQ7tuahQ=
+			l9nV49kTOTSS9haInC4zbR8gK3OztIWSToalEAicUM0=
 			</data>
 		</dict>
 		<key>Headers/RCChatRoomEnumDefine.h</key>

+ 8 - 8
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/Info.plist

@@ -6,31 +6,31 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_armv7</string>
 			<key>LibraryPath</key>
 			<string>RongCustomerService.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>i386</string>
-				<string>x86_64</string>
+				<string>arm64</string>
+				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>ios-i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>RongCustomerService.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
-				<string>armv7</string>
+				<string>i386</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

+ 21 - 17
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/Headers/RCCustomerServiceClient.h

@@ -12,6 +12,8 @@
 #import "RCCustomerServiceInfo.h"
 #import "RCCustomerServiceDefine.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCCustomerServiceClient : NSObject
 
 + (instancetype)sharedCustomerServiceClient;
@@ -41,12 +43,12 @@
  */
 - (void)startCustomerService:(NSString *)kefuId
                         info:(RCCustomerServiceInfo *)csInfo
-                   onSuccess:(void (^)(RCCustomerServiceConfig *config))successBlock
-                     onError:(void (^)(int errorCode, NSString *errMsg))errorBlock
-                  onModeType:(void (^)(RCCSModeType mode))modeTypeBlock
-            onPullEvaluation:(void (^)(NSString *dialogId))pullEvaluationBlock
-               onSelectGroup:(void (^)(NSArray<RCCustomerServiceGroupItem *> *groupList))selectGroupBlock
-                      onQuit:(void (^)(NSString *quitMsg))quitBlock;
+                   onSuccess:(nullable void (^)(RCCustomerServiceConfig *config))successBlock
+                     onError:(nullable void (^)(int errorCode, NSString *errMsg))errorBlock
+                  onModeType:(nullable void (^)(RCCSModeType mode))modeTypeBlock
+            onPullEvaluation:(nullable void (^)(NSString *dialogId))pullEvaluationBlock
+               onSelectGroup:(nullable void (^)(NSArray<RCCustomerServiceGroupItem *> *groupList))selectGroupBlock
+                      onQuit:(nullable void (^)(NSString *quitMsg))quitBlock;
 
 /*!
  客服后台关于评价相关的客服参数配置
@@ -58,7 +60,7 @@
 
  @remarks 客服
  */
-- (void)getHumanEvaluateCustomerServiceConfig:(void (^)(NSDictionary *evaConfig))evaConfigBlock;
+- (void)getHumanEvaluateCustomerServiceConfig:(nullable void (^)(NSDictionary *evaConfig))evaConfigBlock;
 
 /*!
  结束客服聊天
@@ -120,9 +122,9 @@
  @remarks 客服
  */
 - (void)evaluateCustomerService:(NSString *)kefuId
-                   knownledgeId:(NSString *)knownledgeId
+                   knownledgeId:(nullable NSString *)knownledgeId
                      robotValue:(BOOL)isRobotResolved
-                        suggest:(NSString *)suggest;
+                        suggest:(nullable NSString *)suggest;
 
 /*!
  评价人工客服。
@@ -146,12 +148,12 @@
  @remarks 客服
  */
 - (void)evaluateCustomerService:(NSString *)kefuId
-                       dialogId:(NSString *)dialogId
+                       dialogId:(nullable NSString *)dialogId
                       starValue:(int)value
-                        suggest:(NSString *)suggest
+                        suggest:(nullable NSString *)suggest
                   resolveStatus:(RCCSResolveStatus)resolveStatus
-                        tagText:(NSString *)tagText
-                          extra:(NSDictionary *)extra;
+                        tagText:(nullable NSString *)tagText
+                          extra:(nullable NSDictionary *)extra;
 
 /*!
  通用客服评价,不区分机器人人工
@@ -171,9 +173,9 @@
  @remarks 客服
  */
 - (void)evaluateCustomerService:(NSString *)kefuId
-                       dialogId:(NSString *)dialogId
+                       dialogId:(nullable NSString *)dialogId
                       starValue:(int)value
-                        suggest:(NSString *)suggest
+                        suggest:(nullable NSString *)suggest
                   resolveStatus:(RCCSResolveStatus)resolveStatus;
 
 /*!
@@ -192,6 +194,8 @@
  */
 - (void)leaveMessageCustomerService:(NSString *)kefuId
                     leaveMessageDic:(NSDictionary *)leaveMessageDic
-                            success:(void (^)(void))successBlock
-                            failure:(void (^)(void))failureBlock;
+                            success:(nullable void (^)(void))successBlock
+                            failure:(nullable void (^)(void))failureBlock;
 @end
+
+NS_ASSUME_NONNULL_END

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/RongCustomerService


+ 4 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-arm64_armv7/RongCustomerService.framework/_CodeSignature/CodeResources

@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/RCCustomerServiceClient.h</key>
 		<data>
-		UtLsI/W1IaC+rck6lPTxT8efqyg=
+		InJKvA/v3zT70qqgX40RwVv++sY=
 		</data>
 		<key>Headers/RCCustomerServiceConfig.h</key>
 		<data>
@@ -46,7 +46,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		MJngpaKukoA8r4fvmrWlDMj85as=
+		1SUEaNXskmnVcRfKJ8CbF/OoX88=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -92,11 +92,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			UtLsI/W1IaC+rck6lPTxT8efqyg=
+			InJKvA/v3zT70qqgX40RwVv++sY=
 			</data>
 			<key>hash2</key>
 			<data>
-			PY87RmNBfbmpz5syGED5TMLutjSvrGp0loU2x5Bzs+I=
+			0kimGge6yUjOm9v81yOGIatqy86a7VBjbUx8+/5gkbc=
 			</data>
 		</dict>
 		<key>Headers/RCCustomerServiceConfig.h</key>

+ 21 - 17
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/Headers/RCCustomerServiceClient.h

@@ -12,6 +12,8 @@
 #import "RCCustomerServiceInfo.h"
 #import "RCCustomerServiceDefine.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCCustomerServiceClient : NSObject
 
 + (instancetype)sharedCustomerServiceClient;
@@ -41,12 +43,12 @@
  */
 - (void)startCustomerService:(NSString *)kefuId
                         info:(RCCustomerServiceInfo *)csInfo
-                   onSuccess:(void (^)(RCCustomerServiceConfig *config))successBlock
-                     onError:(void (^)(int errorCode, NSString *errMsg))errorBlock
-                  onModeType:(void (^)(RCCSModeType mode))modeTypeBlock
-            onPullEvaluation:(void (^)(NSString *dialogId))pullEvaluationBlock
-               onSelectGroup:(void (^)(NSArray<RCCustomerServiceGroupItem *> *groupList))selectGroupBlock
-                      onQuit:(void (^)(NSString *quitMsg))quitBlock;
+                   onSuccess:(nullable void (^)(RCCustomerServiceConfig *config))successBlock
+                     onError:(nullable void (^)(int errorCode, NSString *errMsg))errorBlock
+                  onModeType:(nullable void (^)(RCCSModeType mode))modeTypeBlock
+            onPullEvaluation:(nullable void (^)(NSString *dialogId))pullEvaluationBlock
+               onSelectGroup:(nullable void (^)(NSArray<RCCustomerServiceGroupItem *> *groupList))selectGroupBlock
+                      onQuit:(nullable void (^)(NSString *quitMsg))quitBlock;
 
 /*!
  客服后台关于评价相关的客服参数配置
@@ -58,7 +60,7 @@
 
  @remarks 客服
  */
-- (void)getHumanEvaluateCustomerServiceConfig:(void (^)(NSDictionary *evaConfig))evaConfigBlock;
+- (void)getHumanEvaluateCustomerServiceConfig:(nullable void (^)(NSDictionary *evaConfig))evaConfigBlock;
 
 /*!
  结束客服聊天
@@ -120,9 +122,9 @@
  @remarks 客服
  */
 - (void)evaluateCustomerService:(NSString *)kefuId
-                   knownledgeId:(NSString *)knownledgeId
+                   knownledgeId:(nullable NSString *)knownledgeId
                      robotValue:(BOOL)isRobotResolved
-                        suggest:(NSString *)suggest;
+                        suggest:(nullable NSString *)suggest;
 
 /*!
  评价人工客服。
@@ -146,12 +148,12 @@
  @remarks 客服
  */
 - (void)evaluateCustomerService:(NSString *)kefuId
-                       dialogId:(NSString *)dialogId
+                       dialogId:(nullable NSString *)dialogId
                       starValue:(int)value
-                        suggest:(NSString *)suggest
+                        suggest:(nullable NSString *)suggest
                   resolveStatus:(RCCSResolveStatus)resolveStatus
-                        tagText:(NSString *)tagText
-                          extra:(NSDictionary *)extra;
+                        tagText:(nullable NSString *)tagText
+                          extra:(nullable NSDictionary *)extra;
 
 /*!
  通用客服评价,不区分机器人人工
@@ -171,9 +173,9 @@
  @remarks 客服
  */
 - (void)evaluateCustomerService:(NSString *)kefuId
-                       dialogId:(NSString *)dialogId
+                       dialogId:(nullable NSString *)dialogId
                       starValue:(int)value
-                        suggest:(NSString *)suggest
+                        suggest:(nullable NSString *)suggest
                   resolveStatus:(RCCSResolveStatus)resolveStatus;
 
 /*!
@@ -192,6 +194,8 @@
  */
 - (void)leaveMessageCustomerService:(NSString *)kefuId
                     leaveMessageDic:(NSDictionary *)leaveMessageDic
-                            success:(void (^)(void))successBlock
-                            failure:(void (^)(void))failureBlock;
+                            success:(nullable void (^)(void))successBlock
+                            failure:(nullable void (^)(void))failureBlock;
 @end
+
+NS_ASSUME_NONNULL_END

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/RongCustomerService


+ 4 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongCustomerService.xcframework/ios-i386_x86_64-simulator/RongCustomerService.framework/_CodeSignature/CodeResources

@@ -18,7 +18,7 @@
 		</data>
 		<key>Headers/RCCustomerServiceClient.h</key>
 		<data>
-		UtLsI/W1IaC+rck6lPTxT8efqyg=
+		InJKvA/v3zT70qqgX40RwVv++sY=
 		</data>
 		<key>Headers/RCCustomerServiceConfig.h</key>
 		<data>
@@ -46,7 +46,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		eLtjrqDJpDZrgr++JZVrRUMZhO8=
+		DDBSngDnf31UQEfr8yxGgfEtmq0=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -92,11 +92,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			UtLsI/W1IaC+rck6lPTxT8efqyg=
+			InJKvA/v3zT70qqgX40RwVv++sY=
 			</data>
 			<key>hash2</key>
 			<data>
-			PY87RmNBfbmpz5syGED5TMLutjSvrGp0loU2x5Bzs+I=
+			0kimGge6yUjOm9v81yOGIatqy86a7VBjbUx8+/5gkbc=
 			</data>
 		</dict>
 		<key>Headers/RCCustomerServiceConfig.h</key>

+ 2 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/Headers/RCDiscussion.h

@@ -52,14 +52,14 @@
 
  @warning **已废弃,请勿使用。**
  */
-@property (nonatomic, assign) __deprecated_msg("已废弃,请勿使用。") int conversationType;
+@property (nonatomic, assign) int conversationType __attribute__((deprecated));
 
 /*!
  讨论组是否允许消息提醒(已废弃,请勿使用)
 
  @warning **已废弃,请勿使用。**
  */
-@property (nonatomic, assign) __deprecated_msg("已废弃,请勿使用。") int pushMessageNotificationStatus;
+@property (nonatomic, assign) int pushMessageNotificationStatus __attribute__((deprecated));
 
 /*!
  讨论组初始化方法

+ 19 - 16
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/Headers/RCDiscussionClient.h

@@ -10,6 +10,7 @@
 #import <RongIMLibCore/RCStatusDefine.h>
 #import "RCDiscussion.h"
 
+NS_ASSUME_NONNULL_BEGIN
 
 @interface RCDiscussionClient : NSObject
 
@@ -29,9 +30,9 @@
  @remarks 会话
  */
 - (void)createDiscussion:(NSString *)name
-              userIdList:(NSArray *)userIdList
-                 success:(void (^)(RCDiscussion *discussion))successBlock
-                   error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+              userIdList:(NSArray<NSString *> *)userIdList
+                 success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                   error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组加人,将用户加入讨论组
@@ -47,9 +48,9 @@
  @remarks 会话
  */
 - (void)addMemberToDiscussion:(NSString *)discussionId
-                   userIdList:(NSArray *)userIdList
-                      success:(void (^)(RCDiscussion *discussion))successBlock
-                        error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                   userIdList:(NSArray<NSString *> *)userIdList
+                      success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                        error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组踢人,将用户移出讨论组
@@ -70,8 +71,8 @@
  */
 - (void)removeMemberFromDiscussion:(NSString *)discussionId
                             userId:(NSString *)userId
-                           success:(void (^)(RCDiscussion *discussion))successBlock
-                             error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                           success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                             error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  退出当前讨论组
@@ -83,8 +84,8 @@
  @remarks 会话
  */
 - (void)quitDiscussion:(NSString *)discussionId
-               success:(void (^)(RCDiscussion *discussion))successBlock
-                 error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+               success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                 error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  获取讨论组的信息
@@ -97,8 +98,8 @@
  @remarks 会话
  */
 - (void)getDiscussion:(NSString *)discussionId
-              success:(void (^)(RCDiscussion *discussion))successBlock
-                error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+              success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组名称
@@ -114,8 +115,8 @@
  */
 - (void)setDiscussionName:(NSString *)discussionId
                      name:(NSString *)discussionName
-                  success:(void (^)(void))successBlock
-                    error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                  success:(nullable void (^)(void))successBlock
+                    error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组是否开放加人权限
@@ -132,8 +133,10 @@
  */
 - (void)setDiscussionInviteStatus:(NSString *)discussionId
                            isOpen:(BOOL)isOpen
-                          success:(void (^)(void))successBlock
-                            error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                          success:(nullable void (^)(void))successBlock
+                            error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 @end
 
+NS_ASSUME_NONNULL_END
+

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/RongDiscussion


+ 7 - 7
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-arm64_armv7/RongDiscussion.framework/_CodeSignature/CodeResources

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/RCDiscussion.h</key>
 		<data>
-		ZMcZp7AIBiVi+FWhQqopyCM57vM=
+		gDLV5Xf6jOZU+R2u0jWODy7Pfr0=
 		</data>
 		<key>Headers/RCDiscussionClient.h</key>
 		<data>
-		p2+nW4fH+zqAsnKe9aoW5HS+IRw=
+		cuGQKJ+iXAkDPrr51a6RblC+znI=
 		</data>
 		<key>Headers/RCDiscussionNotificationMessage.h</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		RiDMJ3EfW1O0d2kcFrB3HJOwA6o=
+		oCJI7OHHTS1ZZJFB92ow9mDxKVU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -35,22 +35,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ZMcZp7AIBiVi+FWhQqopyCM57vM=
+			gDLV5Xf6jOZU+R2u0jWODy7Pfr0=
 			</data>
 			<key>hash2</key>
 			<data>
-			r6HkAL7Y07LuVIMNT0r5Hgxv4x23fESWcpz7CRcINdQ=
+			wweJchD933kRgW6/YRDXvXwXgWLqBkZ9LZ8Awm9qWds=
 			</data>
 		</dict>
 		<key>Headers/RCDiscussionClient.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			p2+nW4fH+zqAsnKe9aoW5HS+IRw=
+			cuGQKJ+iXAkDPrr51a6RblC+znI=
 			</data>
 			<key>hash2</key>
 			<data>
-			zSTAHakY8agmYT8wwo7755N2mlAMvQwKHwyupQ3U7kE=
+			ufCf81zho5wQP7LoYuQtTMZuygmI/Kxs2OVqyaQtpI4=
 			</data>
 		</dict>
 		<key>Headers/RCDiscussionNotificationMessage.h</key>

+ 2 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/Headers/RCDiscussion.h

@@ -52,14 +52,14 @@
 
  @warning **已废弃,请勿使用。**
  */
-@property (nonatomic, assign) __deprecated_msg("已废弃,请勿使用。") int conversationType;
+@property (nonatomic, assign) int conversationType __attribute__((deprecated));
 
 /*!
  讨论组是否允许消息提醒(已废弃,请勿使用)
 
  @warning **已废弃,请勿使用。**
  */
-@property (nonatomic, assign) __deprecated_msg("已废弃,请勿使用。") int pushMessageNotificationStatus;
+@property (nonatomic, assign) int pushMessageNotificationStatus __attribute__((deprecated));
 
 /*!
  讨论组初始化方法

+ 19 - 16
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/Headers/RCDiscussionClient.h

@@ -10,6 +10,7 @@
 #import <RongIMLibCore/RCStatusDefine.h>
 #import "RCDiscussion.h"
 
+NS_ASSUME_NONNULL_BEGIN
 
 @interface RCDiscussionClient : NSObject
 
@@ -29,9 +30,9 @@
  @remarks 会话
  */
 - (void)createDiscussion:(NSString *)name
-              userIdList:(NSArray *)userIdList
-                 success:(void (^)(RCDiscussion *discussion))successBlock
-                   error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+              userIdList:(NSArray<NSString *> *)userIdList
+                 success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                   error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组加人,将用户加入讨论组
@@ -47,9 +48,9 @@
  @remarks 会话
  */
 - (void)addMemberToDiscussion:(NSString *)discussionId
-                   userIdList:(NSArray *)userIdList
-                      success:(void (^)(RCDiscussion *discussion))successBlock
-                        error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                   userIdList:(NSArray<NSString *> *)userIdList
+                      success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                        error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组踢人,将用户移出讨论组
@@ -70,8 +71,8 @@
  */
 - (void)removeMemberFromDiscussion:(NSString *)discussionId
                             userId:(NSString *)userId
-                           success:(void (^)(RCDiscussion *discussion))successBlock
-                             error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                           success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                             error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  退出当前讨论组
@@ -83,8 +84,8 @@
  @remarks 会话
  */
 - (void)quitDiscussion:(NSString *)discussionId
-               success:(void (^)(RCDiscussion *discussion))successBlock
-                 error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+               success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                 error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  获取讨论组的信息
@@ -97,8 +98,8 @@
  @remarks 会话
  */
 - (void)getDiscussion:(NSString *)discussionId
-              success:(void (^)(RCDiscussion *discussion))successBlock
-                error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+              success:(nullable void (^)(RCDiscussion *discussion))successBlock
+                error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组名称
@@ -114,8 +115,8 @@
  */
 - (void)setDiscussionName:(NSString *)discussionId
                      name:(NSString *)discussionName
-                  success:(void (^)(void))successBlock
-                    error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                  success:(nullable void (^)(void))successBlock
+                    error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组是否开放加人权限
@@ -132,8 +133,10 @@
  */
 - (void)setDiscussionInviteStatus:(NSString *)discussionId
                            isOpen:(BOOL)isOpen
-                          success:(void (^)(void))successBlock
-                            error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                          success:(nullable void (^)(void))successBlock
+                            error:(nullable void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 @end
 
+NS_ASSUME_NONNULL_END
+

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/RongDiscussion


+ 7 - 7
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongDiscussion.xcframework/ios-i386_x86_64-simulator/RongDiscussion.framework/_CodeSignature/CodeResources

@@ -6,11 +6,11 @@
 	<dict>
 		<key>Headers/RCDiscussion.h</key>
 		<data>
-		ZMcZp7AIBiVi+FWhQqopyCM57vM=
+		gDLV5Xf6jOZU+R2u0jWODy7Pfr0=
 		</data>
 		<key>Headers/RCDiscussionClient.h</key>
 		<data>
-		p2+nW4fH+zqAsnKe9aoW5HS+IRw=
+		cuGQKJ+iXAkDPrr51a6RblC+znI=
 		</data>
 		<key>Headers/RCDiscussionNotificationMessage.h</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		j/Orkx+EBqC1GI1jy1oZgoDhoiY=
+		KCvqnOfMrb9Q0w0GXLDnlZlJsTU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -35,22 +35,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ZMcZp7AIBiVi+FWhQqopyCM57vM=
+			gDLV5Xf6jOZU+R2u0jWODy7Pfr0=
 			</data>
 			<key>hash2</key>
 			<data>
-			r6HkAL7Y07LuVIMNT0r5Hgxv4x23fESWcpz7CRcINdQ=
+			wweJchD933kRgW6/YRDXvXwXgWLqBkZ9LZ8Awm9qWds=
 			</data>
 		</dict>
 		<key>Headers/RCDiscussionClient.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			p2+nW4fH+zqAsnKe9aoW5HS+IRw=
+			cuGQKJ+iXAkDPrr51a6RblC+znI=
 			</data>
 			<key>hash2</key>
 			<data>
-			zSTAHakY8agmYT8wwo7755N2mlAMvQwKHwyupQ3U7kE=
+			ufCf81zho5wQP7LoYuQtTMZuygmI/Kxs2OVqyaQtpI4=
 			</data>
 		</dict>
 		<key>Headers/RCDiscussionNotificationMessage.h</key>

+ 8 - 8
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/Info.plist

@@ -6,31 +6,31 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>ios-i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>RongIMKit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
-				<string>armv7</string>
+				<string>i386</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_armv7</string>
 			<key>LibraryPath</key>
 			<string>RongIMKit.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>i386</string>
-				<string>x86_64</string>
+				<string>arm64</string>
+				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

+ 10 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h

@@ -461,6 +461,14 @@
  */
 - (void)sightDidFinishRecord:(NSString *)url thumbnail:(UIImage *)image duration:(NSUInteger)duration;
 
+/**
+ 相机录制小视频失败后调用
+
+ @param error 错误
+ @param status AVAssetWriter 状态
+ */
+- (void)sightDidRecordFailedWith:(NSError *)error status:(NSInteger)status;
+
 /*!
  地理位置选择完成之后的回调
  @param location       位置的二维坐标
@@ -481,7 +489,7 @@
  */
 - (void)locationDidSelect:(CLLocationCoordinate2D)location
              locationName:(NSString *)locationName
-            mapScreenShot:(UIImage *)mapScreenShot __deprecated_msg("已废弃并失效, 请通过实现扩展区位置按钮点击跳转, 设置 RCLocationPickerViewController 的代理 RCLocationPickerViewControllerDelegate,来实现地理位置选择完成之后的代理回调方法");
+            mapScreenShot:(UIImage *)mapScreenShot __deprecated_msg("Use RCLocationPickerViewControllerDelegate on RCLocationPickerViewController instead");
 
 /*!
  相册选择图片列表,返回图片的 NSData
@@ -550,6 +558,6 @@
  */
 - (void)onClickEditPicture:(UIViewController *)rootCtrl
              originalImage:(UIImage *)originalImage
-            editCompletion:(void (^)(UIImage *editedImage))editCompletion __deprecated_msg("已废弃");
+            editCompletion:(void (^)(UIImage *editedImage))editCompletion __attribute__((deprecated));
 
 @end

+ 17 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCConversationModel.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <RongIMLib/RongIMLib.h>
+#import <RongIMLibCore/RCStatusDefine.h>
 
 /*!
  会话Cell数据模型的显示类型
@@ -156,6 +157,22 @@ typedef NS_ENUM(NSUInteger, RCConversationModelType) {
 */
 @property (nonatomic, assign) int mentionedCount;
 
+
+/*!
+ 免打扰级别
+ */
+@property (nonatomic, assign) RCPushNotificationLevel notificationLevel;
+
+/*!
+ 会话中第一条未读消息时间戳(Unix时间戳、毫秒)
+
+ 仅支持 超级群会话
+ @Since 5.2.5
+
+*/
+@property (nonatomic, assign) long long firstUnreadMsgSendTime;
+
+
 /*!
  初始化会话显示数据模型
 

+ 14 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCConversationViewController.h

@@ -16,8 +16,8 @@
 #import "RCThemeDefine.h"
 #import <UIKit/UIKit.h>
 #import "RCReferencingView.h"
-#import <RongLocation/RCLocationMessage.h>
 
+@class RCLocationMessage;
 @class RCCustomerServiceInfo,RCPublicServiceMenuItem;
 /*!
  客服服务状态
@@ -295,6 +295,7 @@ typedef enum : NSUInteger {
 /*!
  设置进入会话页面后下拉刷新从本地数据库取的消息的条数,默认是 10。
  @discussion 此属性需要在viewDidLoad之前进行设置。
+ 从 5.2.4 及之后版本, SDK 加载消息的个数使用 defaultRemoteHistoryMessageCount, 请勿再使用该字段。
  */
 @property (nonatomic, assign) int defaultLocalHistoryMessageCount;
 
@@ -418,7 +419,7 @@ typedef enum : NSUInteger {
  如果您需要重写此接口,请注意调用super。
  因 UI 逻辑修改为将原消息移动到会话页面最下方,不删除原消息直接重新发送原消息,但是此方法会重新生成消息发送,故废弃。
  */
-- (void)resendMessage:(RCMessageContent *)messageContent __deprecated_msg("已废弃,请使用 resendMessageWithModel");
+- (void)resendMessage:(RCMessageContent *)messageContent __deprecated_msg("Use resendMessageWithModel instead");
 
 /*!
  重新发送消息
@@ -493,7 +494,7 @@ typedef enum : NSUInteger {
  @param status          发送状态,0表示成功,非0表示失败
  @param messageContent   消息内容
  */
-- (void)didSendMessage:(NSInteger)status content:(RCMessageContent *)messageContent __deprecated_msg("已废弃,请使用 - (void)didSendMessageModel:(NSInteger)status model:(RCMessageModel *)messageModel");
+- (void)didSendMessage:(NSInteger)status content:(RCMessageContent *)messageContent __deprecated_msg("Use - (void)didSendMessageModel:(NSInteger)status model:(RCMessageModel *)messageModel instead");
 
 /*!
  发送消息完成的回调
@@ -550,6 +551,14 @@ typedef enum : NSUInteger {
 
 #pragma mark - 自定义消息
 /*!
+ 用户注册自定义消息的入口
+
+ @discussion 如果有自定义消息,请在该方法内执行
+ - (void)registerClass:(Class)cellClass forMessageClass:(Class)messageClass
+ 进行消息注册
+ */
+- (void)registerCustomCellsAndMessages;
+/*!
  注册自定义消息的Cell
 
  @param cellClass     自定义消息cell的类
@@ -558,7 +567,8 @@ typedef enum : NSUInteger {
  @discussion
  你需要在cell中重写RCMessageBaseCell基类的sizeForMessageModel:withCollectionViewWidth:referenceExtraHeight:来计算cell的高度。
  
- @discussion 如果有自定义消息,在会话页面子类 viewDidLoad 方法中需优先注册自定义消息的 cell, 再做其他操作
+ @discussion 如果有自定义消息,在会话页面子类 registerCustomCellsAndMessages 方法中需优先注册自定义消息的 cell, 再做其他操作;  请不要在其他方法中进行注册, 可能会有渲染时序问题
+
  */
 - (void)registerClass:(Class)cellClass forMessageClass:(Class)messageClass;
 

+ 28 - 28
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCIM+Deprecated.h

@@ -21,7 +21,7 @@
  @discussion 当App处于后台时,默认会弹出本地通知提示,您可以通过将此属性设置为YES,关闭所有的本地通知。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
-@property (nonatomic, assign) BOOL disableMessageNotificaiton __deprecated_msg("已废弃,请使用 RCKitConfigCenter.message.disableMessageNotificaiton");
+@property (nonatomic, assign) BOOL disableMessageNotificaiton __deprecated_msg("Use RCKitConfigCenter.message.disableMessageNotificaiton instead");
 
 /*!
  是否关闭所有的前台消息提示音,默认值是NO
@@ -29,13 +29,13 @@
  @discussion 当App处于前台时,默认会播放消息提示音,您可以通过将此属性设置为YES,关闭所有的前台消息提示音。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
-@property (nonatomic, assign) BOOL disableMessageAlertSound __deprecated_msg("已废弃,请使用 RCKitConfigCenter.message.disableMessageAlertSound");
+@property (nonatomic, assign) BOOL disableMessageAlertSound __deprecated_msg("Use RCKitConfigCenter.message.disableMessageAlertSound instead");
 
 /*!
  是否开启发送输入状态,默认值是 YES,开启之后在输入消息的时候对方可以看到正在输入的提示(目前只支持单聊)
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
-@property (nonatomic, assign) BOOL enableTypingStatus __deprecated_msg("已废弃,请使用 RCKitConfigCenter.message.enableTypingStatus");
+@property (nonatomic, assign) BOOL enableTypingStatus __deprecated_msg("Use RCKitConfigCenter.message.enableTypingStatus instead");
 
 /*!
  开启已读回执功能的会话类型,默认为 单聊、群聊和讨论组
@@ -47,7 +47,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, copy) NSArray *enabledReadReceiptConversationTypeList __deprecated_msg(
-   "已废弃,请使用 RCKitConfigCenter.message.enabledReadReceiptConversationTypeList,设置开启回执的会话类型。");
+   "Use RCKitConfigCenter.message.enabledReadReceiptConversationTypeList instead");
 
 /*!
  设置群组、讨论组发送已读回执请求的有效时间,单位是秒,默认值是 120s。
@@ -56,7 +56,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger maxReadRequestDuration __deprecated_msg(
-  "已废弃,请使用 RCKitConfigCenter.message.maxReadRequestDuration");
+  "Use RCKitConfigCenter.message.maxReadRequestDuration instead");
 
 /*!
  是否开启多端同步未读状态的功能,默认值是 YES
@@ -65,28 +65,28 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableSyncReadStatus __deprecated_msg(
- "已废弃,请使用 RCKitConfigCenter.message.enableSyncReadStatus");
+ "Use RCKitConfigCenter.message.enableSyncReadStatus instead");
 
 /*!
  是否开启消息@提醒功能(只支持群聊和讨论组, App需要实现群成员数据源groupMemberDataSource),默认值是 YES。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableMessageMentioned __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableMessageMentioned");
+"Use RCKitConfigCenter.message.enableMessageMentioned instead");
 
 /*!
  是否开启消息撤回功能,默认值是 YES。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableMessageRecall __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableMessageRecall");
+"Use RCKitConfigCenter.message.enableMessageRecall instead");
 
 /*!
  消息可撤回的最大时间,单位是秒,默认值是120s。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger maxRecallDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.maxRecallDuration");
+"Use RCKitConfigCenter.message.maxRecallDuration instead");
 
 /*!
  是否在会话页面和会话列表界面显示未注册的消息类型,默认值是 YES
@@ -99,7 +99,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL showUnkownMessage __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.showUnkownMessage");
+"Use RCKitConfigCenter.message.showUnkownMessage instead");
 
 /*!
  未注册的消息类型是否显示本地通知,默认值是NO
@@ -113,7 +113,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL showUnkownMessageNotificaiton __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.showUnkownMessageNotificaiton");
+"Use RCKitConfigCenter.message.showUnkownMessageNotificaiton instead");
 
 /*!
  语音消息的最大长度
@@ -122,7 +122,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger maxVoiceDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.maxVoiceDuration");
+"Use RCKitConfigCenter.message.maxVoiceDuration instead");
 
 /*!
  APP是否独占音频
@@ -133,7 +133,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL isExclusiveSoundPlayer __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.isExclusiveSoundPlayer");
+"Use RCKitConfigCenter.message.isExclusiveSoundPlayer instead");
 
 /*!
  选择媒体资源时,是否包含视频文件,默认值是NO
@@ -142,21 +142,21 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL isMediaSelectorContainVideo __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.isMediaSelectorContainVideo");
+"Use RCKitConfigCenter.message.isMediaSelectorContainVideo instead");
 
 /**
  GIF 消息自动下载的大小 size, 单位 KB
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSInteger GIFMsgAutoDownloadSize __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.GIFMsgAutoDownloadSize");
+"Use RCKitConfigCenter.message.GIFMsgAutoDownloadSize instead");
 
 /*!
  是否开启合并转发功能,默认值是NO,开启之后可以合并转发消息(目前只支持单聊和群聊)
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableSendCombineMessage __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableSendCombineMessage");
+"Use RCKitConfigCenter.message.enableSendCombineMessage instead");
 
 /*!
  是否开启阅后即焚功能,默认值是NO,开启之后可以在聊天页面扩展板中使用阅后即焚功能(目前只支持单聊)
@@ -165,7 +165,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableDestructMessage __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableDestructMessage");
+"Use RCKitConfigCenter.message.enableDestructMessage instead");
 
 /*!
  消息撤回后可重新编辑的时间,单位是秒,默认值是 300s。
@@ -174,14 +174,14 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger reeditDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.reeditDuration");
+"Use RCKitConfigCenter.message.reeditDuration instead");
 
 /*!
  是否支持消息引用功能,默认值是YES ,聊天页面长按消息支持引用(目前仅支持文本消息、文件消息、图文消息、图片消息、引用消息的引用)
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
 */
 @property (nonatomic, assign) BOOL enableMessageReference __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableMessageReference");
+"Use RCKitConfigCenter.message.enableMessageReference instead");
 
 /**
 小视频的最长录制时间,单位是秒,默认值是 10s。
@@ -190,18 +190,18 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger sightRecordMaxDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.sightRecordMaxDuration");
+"Use RCKitConfigCenter.message.sightRecordMaxDuration instead");
 
 #pragma mark 头像显示
 
 /*!
  SDK中全局的导航按钮字体颜色
 
- @discussion 默认值为[UIColor whiteColor]
+ @discussion 默认值为[UIColor blackColor]
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, strong) UIColor *globalNavigationBarTintColor __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalNavigationBarTintColor");
+"Use RCKitConfigCenter.ui.globalNavigationBarTintColor instead");
 
 /*!
  SDK会话列表界面中显示的头像形状,矩形或者圆形
@@ -210,7 +210,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) RCUserAvatarStyle globalConversationAvatarStyle __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalConversationAvatarStyle");
+"Use RCKitConfigCenter.ui.globalConversationAvatarStyle instead");
 
 /*!
  SDK会话列表界面中显示的头像大小,高度必须大于或者等于36
@@ -219,7 +219,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) CGSize globalConversationPortraitSize __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalConversationPortraitSize");
+"Use RCKitConfigCenter.ui.globalConversationPortraitSize instead");
 
 /*!
  SDK会话页面中显示的头像形状,矩形或者圆形
@@ -228,7 +228,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) RCUserAvatarStyle globalMessageAvatarStyle __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalMessageAvatarStyle");
+"Use RCKitConfigCenter.ui.globalMessageAvatarStyle instead");
 
 /*!
  SDK会话页面中显示的头像大小
@@ -237,7 +237,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) CGSize globalMessagePortraitSize __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalMessagePortraitSize");
+"Use RCKitConfigCenter.ui.globalMessagePortraitSize instead");
 
 /*!
  SDK会话列表界面和会话页面的头像的圆角曲率半径
@@ -247,12 +247,12 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) CGFloat portraitImageViewCornerRadius __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.portraitImageViewCornerRadius");
+"Use RCKitConfigCenter.ui.portraitImageViewCornerRadius instead");
 
 /*!
 是否支持暗黑模式,默认值是NO,开启之后 UI 支持暗黑模式,可以跟随系统切换
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
 */
 @property (nonatomic, assign) BOOL enableDarkMode __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.enableDarkMode");
+"Use RCKitConfigCenter.ui.enableDarkMode instead");
 @end

+ 8 - 8
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCIM.h

@@ -289,7 +289,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 
  @discussion 被撤回的消息会变更为RCRecallNotificationMessage,App需要在UI上刷新这条消息。
  */
-- (void)onRCIMMessageRecalled:(long)messageId __deprecated_msg("已废弃,请使用 RCIM 的 messageDidRecall");
+- (void)onRCIMMessageRecalled:(long)messageId __deprecated_msg("Use  messageDidRecall on RCIM instead");
 
 /*!
  消息被撤回的回调方法
@@ -803,7 +803,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)createDiscussion:(NSString *)name
               userIdList:(NSArray *)userIdList
                  success:(void (^)(RCDiscussion *discussion))successBlock
-                   error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                   error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组加人,将用户加入讨论组
@@ -818,7 +818,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)addMemberToDiscussion:(NSString *)discussionId
                    userIdList:(NSArray *)userIdList
                       success:(void (^)(RCDiscussion *discussion))successBlock
-                        error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                        error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组踢人,将用户移出讨论组
@@ -836,7 +836,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)removeMemberFromDiscussion:(NSString *)discussionId
                             userId:(NSString *)userId
                            success:(void (^)(RCDiscussion *discussion))successBlock
-                             error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                             error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  退出当前讨论组
@@ -847,7 +847,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
  */
 - (void)quitDiscussion:(NSString *)discussionId
                success:(void (^)(RCDiscussion *discussion))successBlock
-                 error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                 error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  获取讨论组的信息
@@ -858,7 +858,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
  */
 - (void)getDiscussion:(NSString *)discussionId
               success:(void (^)(RCDiscussion *discussion))successBlock
-                error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组名称
@@ -873,7 +873,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)setDiscussionName:(NSString *)discussionId
                      name:(NSString *)discussionName
                   success:(void (^)(void))successBlock
-                    error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                    error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组是否开放加人权限
@@ -889,7 +889,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)setDiscussionInviteStatus:(NSString *)discussionId
                            isOpen:(BOOL)isOpen
                           success:(void (^)(void))successBlock
-                            error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                            error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 #pragma mark - 用户信息、群组信息相关
 

+ 1 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RCKitUIConf.h

@@ -15,7 +15,7 @@
 /*!
  SDK中全局的导航按钮字体颜色
 
- @discussion 默认值为[UIColor whiteColor]
+ @discussion 默认值为[UIColor blackColor]
  */
 @property (nonatomic, strong) UIColor *globalNavigationBarTintColor;
 

+ 3 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Headers/RongIMKit.h

@@ -48,6 +48,7 @@
 #import <RongIMKit/RCReferencingView.h>
 #import <RongIMKit/RCMessageCellTool.h>
 #import <RongIMKit/RCHQVoiceMessageCell.h>
+#import <RongIMKit/RCComplexTextMessageCell.h>
 
 /// 工具类
 #import <RongIMKit/RCKitUtility.h>
@@ -110,6 +111,8 @@
 #import "RCReferencingView.h"
 #import "RCMessageCellTool.h"
 #import "RCHQVoiceMessageCell.h"
+#import "RCComplexTextMessageCell.h"
+
 
 /// 工具类
 #import "RCKitUtility.h"

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/RongIMKit


+ 37 - 22
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-arm64_armv7/RongIMKit.framework/_CodeSignature/CodeResources

@@ -30,7 +30,11 @@
 		</data>
 		<key>Headers/RCChatSessionInputBarControl.h</key>
 		<data>
-		ONwkPZ5QUnDPM8vNV/zRoMADr1s=
+		DkmEa3lR09MsOHqi13Nha563dUQ=
+		</data>
+		<key>Headers/RCComplexTextMessageCell.h</key>
+		<data>
+		0rJhis1pWQ4Fn4sTJn55wGDEOks=
 		</data>
 		<key>Headers/RCContentView.h</key>
 		<data>
@@ -54,7 +58,7 @@
 		</data>
 		<key>Headers/RCConversationModel.h</key>
 		<data>
-		H6OM6XbFI7fU0O1DSZ7mNDIQELc=
+		SqE4WoQkGpIFXzIgvPSoCtjdBSI=
 		</data>
 		<key>Headers/RCConversationStatusView.h</key>
 		<data>
@@ -62,7 +66,7 @@
 		</data>
 		<key>Headers/RCConversationViewController.h</key>
 		<data>
-		bgnzdhnDELRkzP7/YnckS/JfqEY=
+		qGVOQ4BMbuEkDbLx87v/EAJk4HM=
 		</data>
 		<key>Headers/RCEmojiBoardView.h</key>
 		<data>
@@ -106,11 +110,11 @@
 		</data>
 		<key>Headers/RCIM+Deprecated.h</key>
 		<data>
-		krlIui5aUa4WyawRSq1mUSveZ4g=
+		ipPXic/+LaWjogvJXBw3Mm+5mU0=
 		</data>
 		<key>Headers/RCIM.h</key>
 		<data>
-		4x4n1A6k+0AwwloGLvl5jC4DeDg=
+		c96JpR1b2aes3WvdgptJOaYA5xY=
 		</data>
 		<key>Headers/RCImageMessageCell.h</key>
 		<data>
@@ -150,7 +154,7 @@
 		</data>
 		<key>Headers/RCKitUIConf.h</key>
 		<data>
-		p2HF3V5eQYNSG1ElS38fvsz4DAs=
+		qp6uQvPofNNZR+wBsdYr804AaH8=
 		</data>
 		<key>Headers/RCKitUtility.h</key>
 		<data>
@@ -254,7 +258,7 @@
 		</data>
 		<key>Headers/RongIMKit.h</key>
 		<data>
-		P0cOY6HNRicJhYX6JicEpd889sQ=
+		9XqFDUhAT33uLEMPYSwBoECU7Wg=
 		</data>
 		<key>Headers/RongIMKitExtensionModule.h</key>
 		<data>
@@ -262,7 +266,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		kV/XNd13XLdi8kpXFumOE2LBZgs=
+		xYgWmOXNGFLaN67RHfZFReZ4uGI=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -341,11 +345,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ONwkPZ5QUnDPM8vNV/zRoMADr1s=
+			DkmEa3lR09MsOHqi13Nha563dUQ=
+			</data>
+			<key>hash2</key>
+			<data>
+			M5S9qUIjV16y2JwOXc+ZN+lS/p3Pd6pf0YEaZL6OZSc=
+			</data>
+		</dict>
+		<key>Headers/RCComplexTextMessageCell.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			0rJhis1pWQ4Fn4sTJn55wGDEOks=
 			</data>
 			<key>hash2</key>
 			<data>
-			CeGwo6+b/LT9xpBoFFRh2Aup6OTvgRGGPSXpIK2zknU=
+			Bd5AN8OdeB2ivh06nWBJvIeJ0MHCMk1qLpyO3evvmG0=
 			</data>
 		</dict>
 		<key>Headers/RCContentView.h</key>
@@ -407,11 +422,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			H6OM6XbFI7fU0O1DSZ7mNDIQELc=
+			SqE4WoQkGpIFXzIgvPSoCtjdBSI=
 			</data>
 			<key>hash2</key>
 			<data>
-			m7z0F9JNnzvhcprLrlsb0grjKUeXa6I58IMTr3GV7Ew=
+			S+wDE5EMiN/WjZ9J7InfuvP7LJuFAxBZlBCpgKSmC7s=
 			</data>
 		</dict>
 		<key>Headers/RCConversationStatusView.h</key>
@@ -429,11 +444,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			bgnzdhnDELRkzP7/YnckS/JfqEY=
+			qGVOQ4BMbuEkDbLx87v/EAJk4HM=
 			</data>
 			<key>hash2</key>
 			<data>
-			1ztT0zDs/YaqyRAhRA1qvUNhz9DgKoVHhFjufq7jFgA=
+			P+/GQ6sD7hWxB83M7u8kXvP/dVWfyhwPuBM6CdNg044=
 			</data>
 		</dict>
 		<key>Headers/RCEmojiBoardView.h</key>
@@ -550,22 +565,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			krlIui5aUa4WyawRSq1mUSveZ4g=
+			ipPXic/+LaWjogvJXBw3Mm+5mU0=
 			</data>
 			<key>hash2</key>
 			<data>
-			l3uKeyn0SHhLgP5PCftr7szJWexXrFtPh7V7LeDWIVw=
+			NXZuCPUe+HsYbEI7zsaPg4GO7ejBaIxo7b9aj3DdPGc=
 			</data>
 		</dict>
 		<key>Headers/RCIM.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			4x4n1A6k+0AwwloGLvl5jC4DeDg=
+			c96JpR1b2aes3WvdgptJOaYA5xY=
 			</data>
 			<key>hash2</key>
 			<data>
-			DYBzRxHZ/0TJGqKq/WVaKrYmvpuax4SPGlUHSD/0heU=
+			2ALGBrCGQjKhC+SmClhrVOn6RpogR40hjwHuAfw3gTM=
 			</data>
 		</dict>
 		<key>Headers/RCImageMessageCell.h</key>
@@ -671,11 +686,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			p2HF3V5eQYNSG1ElS38fvsz4DAs=
+			qp6uQvPofNNZR+wBsdYr804AaH8=
 			</data>
 			<key>hash2</key>
 			<data>
-			OTTLEgQPnKCmXN2DVUFhSmk6eiZ0nhvq5U1teX+D5F4=
+			0zmNodTl6aiR+I1yHq3j/zX7rXJdct1jYpOVO9SqzeY=
 			</data>
 		</dict>
 		<key>Headers/RCKitUtility.h</key>
@@ -957,11 +972,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			P0cOY6HNRicJhYX6JicEpd889sQ=
+			9XqFDUhAT33uLEMPYSwBoECU7Wg=
 			</data>
 			<key>hash2</key>
 			<data>
-			SERonG6YXAbN7pW//eWm0+6VHDsdfa5e7tHBU4ajero=
+			pX59eQrE25qxVMGohSi4QaPX0Vpzp8NFhD6StLBm0/g=
 			</data>
 		</dict>
 		<key>Headers/RongIMKitExtensionModule.h</key>

+ 10 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCChatSessionInputBarControl.h

@@ -461,6 +461,14 @@
  */
 - (void)sightDidFinishRecord:(NSString *)url thumbnail:(UIImage *)image duration:(NSUInteger)duration;
 
+/**
+ 相机录制小视频失败后调用
+
+ @param error 错误
+ @param status AVAssetWriter 状态
+ */
+- (void)sightDidRecordFailedWith:(NSError *)error status:(NSInteger)status;
+
 /*!
  地理位置选择完成之后的回调
  @param location       位置的二维坐标
@@ -481,7 +489,7 @@
  */
 - (void)locationDidSelect:(CLLocationCoordinate2D)location
              locationName:(NSString *)locationName
-            mapScreenShot:(UIImage *)mapScreenShot __deprecated_msg("已废弃并失效, 请通过实现扩展区位置按钮点击跳转, 设置 RCLocationPickerViewController 的代理 RCLocationPickerViewControllerDelegate,来实现地理位置选择完成之后的代理回调方法");
+            mapScreenShot:(UIImage *)mapScreenShot __deprecated_msg("Use RCLocationPickerViewControllerDelegate on RCLocationPickerViewController instead");
 
 /*!
  相册选择图片列表,返回图片的 NSData
@@ -550,6 +558,6 @@
  */
 - (void)onClickEditPicture:(UIViewController *)rootCtrl
              originalImage:(UIImage *)originalImage
-            editCompletion:(void (^)(UIImage *editedImage))editCompletion __deprecated_msg("已废弃");
+            editCompletion:(void (^)(UIImage *editedImage))editCompletion __attribute__((deprecated));
 
 @end

+ 17 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCConversationModel.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <RongIMLib/RongIMLib.h>
+#import <RongIMLibCore/RCStatusDefine.h>
 
 /*!
  会话Cell数据模型的显示类型
@@ -156,6 +157,22 @@ typedef NS_ENUM(NSUInteger, RCConversationModelType) {
 */
 @property (nonatomic, assign) int mentionedCount;
 
+
+/*!
+ 免打扰级别
+ */
+@property (nonatomic, assign) RCPushNotificationLevel notificationLevel;
+
+/*!
+ 会话中第一条未读消息时间戳(Unix时间戳、毫秒)
+
+ 仅支持 超级群会话
+ @Since 5.2.5
+
+*/
+@property (nonatomic, assign) long long firstUnreadMsgSendTime;
+
+
 /*!
  初始化会话显示数据模型
 

+ 14 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCConversationViewController.h

@@ -16,8 +16,8 @@
 #import "RCThemeDefine.h"
 #import <UIKit/UIKit.h>
 #import "RCReferencingView.h"
-#import <RongLocation/RCLocationMessage.h>
 
+@class RCLocationMessage;
 @class RCCustomerServiceInfo,RCPublicServiceMenuItem;
 /*!
  客服服务状态
@@ -295,6 +295,7 @@ typedef enum : NSUInteger {
 /*!
  设置进入会话页面后下拉刷新从本地数据库取的消息的条数,默认是 10。
  @discussion 此属性需要在viewDidLoad之前进行设置。
+ 从 5.2.4 及之后版本, SDK 加载消息的个数使用 defaultRemoteHistoryMessageCount, 请勿再使用该字段。
  */
 @property (nonatomic, assign) int defaultLocalHistoryMessageCount;
 
@@ -418,7 +419,7 @@ typedef enum : NSUInteger {
  如果您需要重写此接口,请注意调用super。
  因 UI 逻辑修改为将原消息移动到会话页面最下方,不删除原消息直接重新发送原消息,但是此方法会重新生成消息发送,故废弃。
  */
-- (void)resendMessage:(RCMessageContent *)messageContent __deprecated_msg("已废弃,请使用 resendMessageWithModel");
+- (void)resendMessage:(RCMessageContent *)messageContent __deprecated_msg("Use resendMessageWithModel instead");
 
 /*!
  重新发送消息
@@ -493,7 +494,7 @@ typedef enum : NSUInteger {
  @param status          发送状态,0表示成功,非0表示失败
  @param messageContent   消息内容
  */
-- (void)didSendMessage:(NSInteger)status content:(RCMessageContent *)messageContent __deprecated_msg("已废弃,请使用 - (void)didSendMessageModel:(NSInteger)status model:(RCMessageModel *)messageModel");
+- (void)didSendMessage:(NSInteger)status content:(RCMessageContent *)messageContent __deprecated_msg("Use - (void)didSendMessageModel:(NSInteger)status model:(RCMessageModel *)messageModel instead");
 
 /*!
  发送消息完成的回调
@@ -550,6 +551,14 @@ typedef enum : NSUInteger {
 
 #pragma mark - 自定义消息
 /*!
+ 用户注册自定义消息的入口
+
+ @discussion 如果有自定义消息,请在该方法内执行
+ - (void)registerClass:(Class)cellClass forMessageClass:(Class)messageClass
+ 进行消息注册
+ */
+- (void)registerCustomCellsAndMessages;
+/*!
  注册自定义消息的Cell
 
  @param cellClass     自定义消息cell的类
@@ -558,7 +567,8 @@ typedef enum : NSUInteger {
  @discussion
  你需要在cell中重写RCMessageBaseCell基类的sizeForMessageModel:withCollectionViewWidth:referenceExtraHeight:来计算cell的高度。
  
- @discussion 如果有自定义消息,在会话页面子类 viewDidLoad 方法中需优先注册自定义消息的 cell, 再做其他操作
+ @discussion 如果有自定义消息,在会话页面子类 registerCustomCellsAndMessages 方法中需优先注册自定义消息的 cell, 再做其他操作;  请不要在其他方法中进行注册, 可能会有渲染时序问题
+
  */
 - (void)registerClass:(Class)cellClass forMessageClass:(Class)messageClass;
 

+ 28 - 28
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCIM+Deprecated.h

@@ -21,7 +21,7 @@
  @discussion 当App处于后台时,默认会弹出本地通知提示,您可以通过将此属性设置为YES,关闭所有的本地通知。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
-@property (nonatomic, assign) BOOL disableMessageNotificaiton __deprecated_msg("已废弃,请使用 RCKitConfigCenter.message.disableMessageNotificaiton");
+@property (nonatomic, assign) BOOL disableMessageNotificaiton __deprecated_msg("Use RCKitConfigCenter.message.disableMessageNotificaiton instead");
 
 /*!
  是否关闭所有的前台消息提示音,默认值是NO
@@ -29,13 +29,13 @@
  @discussion 当App处于前台时,默认会播放消息提示音,您可以通过将此属性设置为YES,关闭所有的前台消息提示音。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
-@property (nonatomic, assign) BOOL disableMessageAlertSound __deprecated_msg("已废弃,请使用 RCKitConfigCenter.message.disableMessageAlertSound");
+@property (nonatomic, assign) BOOL disableMessageAlertSound __deprecated_msg("Use RCKitConfigCenter.message.disableMessageAlertSound instead");
 
 /*!
  是否开启发送输入状态,默认值是 YES,开启之后在输入消息的时候对方可以看到正在输入的提示(目前只支持单聊)
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
-@property (nonatomic, assign) BOOL enableTypingStatus __deprecated_msg("已废弃,请使用 RCKitConfigCenter.message.enableTypingStatus");
+@property (nonatomic, assign) BOOL enableTypingStatus __deprecated_msg("Use RCKitConfigCenter.message.enableTypingStatus instead");
 
 /*!
  开启已读回执功能的会话类型,默认为 单聊、群聊和讨论组
@@ -47,7 +47,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, copy) NSArray *enabledReadReceiptConversationTypeList __deprecated_msg(
-   "已废弃,请使用 RCKitConfigCenter.message.enabledReadReceiptConversationTypeList,设置开启回执的会话类型。");
+   "Use RCKitConfigCenter.message.enabledReadReceiptConversationTypeList instead");
 
 /*!
  设置群组、讨论组发送已读回执请求的有效时间,单位是秒,默认值是 120s。
@@ -56,7 +56,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger maxReadRequestDuration __deprecated_msg(
-  "已废弃,请使用 RCKitConfigCenter.message.maxReadRequestDuration");
+  "Use RCKitConfigCenter.message.maxReadRequestDuration instead");
 
 /*!
  是否开启多端同步未读状态的功能,默认值是 YES
@@ -65,28 +65,28 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableSyncReadStatus __deprecated_msg(
- "已废弃,请使用 RCKitConfigCenter.message.enableSyncReadStatus");
+ "Use RCKitConfigCenter.message.enableSyncReadStatus instead");
 
 /*!
  是否开启消息@提醒功能(只支持群聊和讨论组, App需要实现群成员数据源groupMemberDataSource),默认值是 YES。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableMessageMentioned __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableMessageMentioned");
+"Use RCKitConfigCenter.message.enableMessageMentioned instead");
 
 /*!
  是否开启消息撤回功能,默认值是 YES。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableMessageRecall __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableMessageRecall");
+"Use RCKitConfigCenter.message.enableMessageRecall instead");
 
 /*!
  消息可撤回的最大时间,单位是秒,默认值是120s。
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger maxRecallDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.maxRecallDuration");
+"Use RCKitConfigCenter.message.maxRecallDuration instead");
 
 /*!
  是否在会话页面和会话列表界面显示未注册的消息类型,默认值是 YES
@@ -99,7 +99,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL showUnkownMessage __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.showUnkownMessage");
+"Use RCKitConfigCenter.message.showUnkownMessage instead");
 
 /*!
  未注册的消息类型是否显示本地通知,默认值是NO
@@ -113,7 +113,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL showUnkownMessageNotificaiton __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.showUnkownMessageNotificaiton");
+"Use RCKitConfigCenter.message.showUnkownMessageNotificaiton instead");
 
 /*!
  语音消息的最大长度
@@ -122,7 +122,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger maxVoiceDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.maxVoiceDuration");
+"Use RCKitConfigCenter.message.maxVoiceDuration instead");
 
 /*!
  APP是否独占音频
@@ -133,7 +133,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL isExclusiveSoundPlayer __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.isExclusiveSoundPlayer");
+"Use RCKitConfigCenter.message.isExclusiveSoundPlayer instead");
 
 /*!
  选择媒体资源时,是否包含视频文件,默认值是NO
@@ -142,21 +142,21 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL isMediaSelectorContainVideo __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.isMediaSelectorContainVideo");
+"Use RCKitConfigCenter.message.isMediaSelectorContainVideo instead");
 
 /**
  GIF 消息自动下载的大小 size, 单位 KB
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSInteger GIFMsgAutoDownloadSize __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.GIFMsgAutoDownloadSize");
+"Use RCKitConfigCenter.message.GIFMsgAutoDownloadSize instead");
 
 /*!
  是否开启合并转发功能,默认值是NO,开启之后可以合并转发消息(目前只支持单聊和群聊)
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableSendCombineMessage __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableSendCombineMessage");
+"Use RCKitConfigCenter.message.enableSendCombineMessage instead");
 
 /*!
  是否开启阅后即焚功能,默认值是NO,开启之后可以在聊天页面扩展板中使用阅后即焚功能(目前只支持单聊)
@@ -165,7 +165,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) BOOL enableDestructMessage __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableDestructMessage");
+"Use RCKitConfigCenter.message.enableDestructMessage instead");
 
 /*!
  消息撤回后可重新编辑的时间,单位是秒,默认值是 300s。
@@ -174,14 +174,14 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger reeditDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.reeditDuration");
+"Use RCKitConfigCenter.message.reeditDuration instead");
 
 /*!
  是否支持消息引用功能,默认值是YES ,聊天页面长按消息支持引用(目前仅支持文本消息、文件消息、图文消息、图片消息、引用消息的引用)
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
 */
 @property (nonatomic, assign) BOOL enableMessageReference __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.enableMessageReference");
+"Use RCKitConfigCenter.message.enableMessageReference instead");
 
 /**
 小视频的最长录制时间,单位是秒,默认值是 10s。
@@ -190,18 +190,18 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) NSUInteger sightRecordMaxDuration __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.message.sightRecordMaxDuration");
+"Use RCKitConfigCenter.message.sightRecordMaxDuration instead");
 
 #pragma mark 头像显示
 
 /*!
  SDK中全局的导航按钮字体颜色
 
- @discussion 默认值为[UIColor whiteColor]
+ @discussion 默认值为[UIColor blackColor]
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, strong) UIColor *globalNavigationBarTintColor __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalNavigationBarTintColor");
+"Use RCKitConfigCenter.ui.globalNavigationBarTintColor instead");
 
 /*!
  SDK会话列表界面中显示的头像形状,矩形或者圆形
@@ -210,7 +210,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) RCUserAvatarStyle globalConversationAvatarStyle __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalConversationAvatarStyle");
+"Use RCKitConfigCenter.ui.globalConversationAvatarStyle instead");
 
 /*!
  SDK会话列表界面中显示的头像大小,高度必须大于或者等于36
@@ -219,7 +219,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) CGSize globalConversationPortraitSize __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalConversationPortraitSize");
+"Use RCKitConfigCenter.ui.globalConversationPortraitSize instead");
 
 /*!
  SDK会话页面中显示的头像形状,矩形或者圆形
@@ -228,7 +228,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) RCUserAvatarStyle globalMessageAvatarStyle __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalMessageAvatarStyle");
+"Use RCKitConfigCenter.ui.globalMessageAvatarStyle instead");
 
 /*!
  SDK会话页面中显示的头像大小
@@ -237,7 +237,7 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) CGSize globalMessagePortraitSize __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.globalMessagePortraitSize");
+"Use RCKitConfigCenter.ui.globalMessagePortraitSize instead");
 
 /*!
  SDK会话列表界面和会话页面的头像的圆角曲率半径
@@ -247,12 +247,12 @@
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
  */
 @property (nonatomic, assign) CGFloat portraitImageViewCornerRadius __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.portraitImageViewCornerRadius");
+"Use RCKitConfigCenter.ui.portraitImageViewCornerRadius instead");
 
 /*!
 是否支持暗黑模式,默认值是NO,开启之后 UI 支持暗黑模式,可以跟随系统切换
  @discussion swift 如果调用宏定义 RCKitConfigCenter 报错,替换为 RCKitConfig 的单例构造方法
 */
 @property (nonatomic, assign) BOOL enableDarkMode __deprecated_msg(
-"已废弃,请使用 RCKitConfigCenter.ui.enableDarkMode");
+"Use RCKitConfigCenter.ui.enableDarkMode instead");
 @end

+ 8 - 8
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCIM.h

@@ -289,7 +289,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 
  @discussion 被撤回的消息会变更为RCRecallNotificationMessage,App需要在UI上刷新这条消息。
  */
-- (void)onRCIMMessageRecalled:(long)messageId __deprecated_msg("已废弃,请使用 RCIM 的 messageDidRecall");
+- (void)onRCIMMessageRecalled:(long)messageId __deprecated_msg("Use  messageDidRecall on RCIM instead");
 
 /*!
  消息被撤回的回调方法
@@ -803,7 +803,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)createDiscussion:(NSString *)name
               userIdList:(NSArray *)userIdList
                  success:(void (^)(RCDiscussion *discussion))successBlock
-                   error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                   error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组加人,将用户加入讨论组
@@ -818,7 +818,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)addMemberToDiscussion:(NSString *)discussionId
                    userIdList:(NSArray *)userIdList
                       success:(void (^)(RCDiscussion *discussion))successBlock
-                        error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                        error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  讨论组踢人,将用户移出讨论组
@@ -836,7 +836,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)removeMemberFromDiscussion:(NSString *)discussionId
                             userId:(NSString *)userId
                            success:(void (^)(RCDiscussion *discussion))successBlock
-                             error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                             error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  退出当前讨论组
@@ -847,7 +847,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
  */
 - (void)quitDiscussion:(NSString *)discussionId
                success:(void (^)(RCDiscussion *discussion))successBlock
-                 error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                 error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  获取讨论组的信息
@@ -858,7 +858,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
  */
 - (void)getDiscussion:(NSString *)discussionId
               success:(void (^)(RCDiscussion *discussion))successBlock
-                error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组名称
@@ -873,7 +873,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)setDiscussionName:(NSString *)discussionId
                      name:(NSString *)discussionName
                   success:(void (^)(void))successBlock
-                    error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                    error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 /*!
  设置讨论组是否开放加人权限
@@ -889,7 +889,7 @@ FOUNDATION_EXPORT NSString *const RCKitDispatchConversationStatusChangeNotificat
 - (void)setDiscussionInviteStatus:(NSString *)discussionId
                            isOpen:(BOOL)isOpen
                           success:(void (^)(void))successBlock
-                            error:(void (^)(RCErrorCode status))errorBlock __deprecated_msg("已废弃,请勿使用。");
+                            error:(void (^)(RCErrorCode status))errorBlock __attribute__((deprecated));
 
 #pragma mark - 用户信息、群组信息相关
 

+ 1 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RCKitUIConf.h

@@ -15,7 +15,7 @@
 /*!
  SDK中全局的导航按钮字体颜色
 
- @discussion 默认值为[UIColor whiteColor]
+ @discussion 默认值为[UIColor blackColor]
  */
 @property (nonatomic, strong) UIColor *globalNavigationBarTintColor;
 

+ 3 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Headers/RongIMKit.h

@@ -48,6 +48,7 @@
 #import <RongIMKit/RCReferencingView.h>
 #import <RongIMKit/RCMessageCellTool.h>
 #import <RongIMKit/RCHQVoiceMessageCell.h>
+#import <RongIMKit/RCComplexTextMessageCell.h>
 
 /// 工具类
 #import <RongIMKit/RCKitUtility.h>
@@ -110,6 +111,8 @@
 #import "RCReferencingView.h"
 #import "RCMessageCellTool.h"
 #import "RCHQVoiceMessageCell.h"
+#import "RCComplexTextMessageCell.h"
+
 
 /// 工具类
 #import "RCKitUtility.h"

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/RongIMKit


+ 37 - 22
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMKit.xcframework/ios-i386_x86_64-simulator/RongIMKit.framework/_CodeSignature/CodeResources

@@ -30,7 +30,11 @@
 		</data>
 		<key>Headers/RCChatSessionInputBarControl.h</key>
 		<data>
-		ONwkPZ5QUnDPM8vNV/zRoMADr1s=
+		DkmEa3lR09MsOHqi13Nha563dUQ=
+		</data>
+		<key>Headers/RCComplexTextMessageCell.h</key>
+		<data>
+		0rJhis1pWQ4Fn4sTJn55wGDEOks=
 		</data>
 		<key>Headers/RCContentView.h</key>
 		<data>
@@ -54,7 +58,7 @@
 		</data>
 		<key>Headers/RCConversationModel.h</key>
 		<data>
-		H6OM6XbFI7fU0O1DSZ7mNDIQELc=
+		SqE4WoQkGpIFXzIgvPSoCtjdBSI=
 		</data>
 		<key>Headers/RCConversationStatusView.h</key>
 		<data>
@@ -62,7 +66,7 @@
 		</data>
 		<key>Headers/RCConversationViewController.h</key>
 		<data>
-		bgnzdhnDELRkzP7/YnckS/JfqEY=
+		qGVOQ4BMbuEkDbLx87v/EAJk4HM=
 		</data>
 		<key>Headers/RCEmojiBoardView.h</key>
 		<data>
@@ -106,11 +110,11 @@
 		</data>
 		<key>Headers/RCIM+Deprecated.h</key>
 		<data>
-		krlIui5aUa4WyawRSq1mUSveZ4g=
+		ipPXic/+LaWjogvJXBw3Mm+5mU0=
 		</data>
 		<key>Headers/RCIM.h</key>
 		<data>
-		4x4n1A6k+0AwwloGLvl5jC4DeDg=
+		c96JpR1b2aes3WvdgptJOaYA5xY=
 		</data>
 		<key>Headers/RCImageMessageCell.h</key>
 		<data>
@@ -150,7 +154,7 @@
 		</data>
 		<key>Headers/RCKitUIConf.h</key>
 		<data>
-		p2HF3V5eQYNSG1ElS38fvsz4DAs=
+		qp6uQvPofNNZR+wBsdYr804AaH8=
 		</data>
 		<key>Headers/RCKitUtility.h</key>
 		<data>
@@ -254,7 +258,7 @@
 		</data>
 		<key>Headers/RongIMKit.h</key>
 		<data>
-		P0cOY6HNRicJhYX6JicEpd889sQ=
+		9XqFDUhAT33uLEMPYSwBoECU7Wg=
 		</data>
 		<key>Headers/RongIMKitExtensionModule.h</key>
 		<data>
@@ -262,7 +266,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		QmUCgKMMK1bHsZQJY7AO1ZSrj8U=
+		jp9saJFK/E9N4zBBxq/jOdy3wlg=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -341,11 +345,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ONwkPZ5QUnDPM8vNV/zRoMADr1s=
+			DkmEa3lR09MsOHqi13Nha563dUQ=
+			</data>
+			<key>hash2</key>
+			<data>
+			M5S9qUIjV16y2JwOXc+ZN+lS/p3Pd6pf0YEaZL6OZSc=
+			</data>
+		</dict>
+		<key>Headers/RCComplexTextMessageCell.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			0rJhis1pWQ4Fn4sTJn55wGDEOks=
 			</data>
 			<key>hash2</key>
 			<data>
-			CeGwo6+b/LT9xpBoFFRh2Aup6OTvgRGGPSXpIK2zknU=
+			Bd5AN8OdeB2ivh06nWBJvIeJ0MHCMk1qLpyO3evvmG0=
 			</data>
 		</dict>
 		<key>Headers/RCContentView.h</key>
@@ -407,11 +422,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			H6OM6XbFI7fU0O1DSZ7mNDIQELc=
+			SqE4WoQkGpIFXzIgvPSoCtjdBSI=
 			</data>
 			<key>hash2</key>
 			<data>
-			m7z0F9JNnzvhcprLrlsb0grjKUeXa6I58IMTr3GV7Ew=
+			S+wDE5EMiN/WjZ9J7InfuvP7LJuFAxBZlBCpgKSmC7s=
 			</data>
 		</dict>
 		<key>Headers/RCConversationStatusView.h</key>
@@ -429,11 +444,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			bgnzdhnDELRkzP7/YnckS/JfqEY=
+			qGVOQ4BMbuEkDbLx87v/EAJk4HM=
 			</data>
 			<key>hash2</key>
 			<data>
-			1ztT0zDs/YaqyRAhRA1qvUNhz9DgKoVHhFjufq7jFgA=
+			P+/GQ6sD7hWxB83M7u8kXvP/dVWfyhwPuBM6CdNg044=
 			</data>
 		</dict>
 		<key>Headers/RCEmojiBoardView.h</key>
@@ -550,22 +565,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			krlIui5aUa4WyawRSq1mUSveZ4g=
+			ipPXic/+LaWjogvJXBw3Mm+5mU0=
 			</data>
 			<key>hash2</key>
 			<data>
-			l3uKeyn0SHhLgP5PCftr7szJWexXrFtPh7V7LeDWIVw=
+			NXZuCPUe+HsYbEI7zsaPg4GO7ejBaIxo7b9aj3DdPGc=
 			</data>
 		</dict>
 		<key>Headers/RCIM.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			4x4n1A6k+0AwwloGLvl5jC4DeDg=
+			c96JpR1b2aes3WvdgptJOaYA5xY=
 			</data>
 			<key>hash2</key>
 			<data>
-			DYBzRxHZ/0TJGqKq/WVaKrYmvpuax4SPGlUHSD/0heU=
+			2ALGBrCGQjKhC+SmClhrVOn6RpogR40hjwHuAfw3gTM=
 			</data>
 		</dict>
 		<key>Headers/RCImageMessageCell.h</key>
@@ -671,11 +686,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			p2HF3V5eQYNSG1ElS38fvsz4DAs=
+			qp6uQvPofNNZR+wBsdYr804AaH8=
 			</data>
 			<key>hash2</key>
 			<data>
-			OTTLEgQPnKCmXN2DVUFhSmk6eiZ0nhvq5U1teX+D5F4=
+			0zmNodTl6aiR+I1yHq3j/zX7rXJdct1jYpOVO9SqzeY=
 			</data>
 		</dict>
 		<key>Headers/RCKitUtility.h</key>
@@ -957,11 +972,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			P0cOY6HNRicJhYX6JicEpd889sQ=
+			9XqFDUhAT33uLEMPYSwBoECU7Wg=
 			</data>
 			<key>hash2</key>
 			<data>
-			SERonG6YXAbN7pW//eWm0+6VHDsdfa5e7tHBU4ajero=
+			pX59eQrE25qxVMGohSi4QaPX0Vpzp8NFhD6StLBm0/g=
 			</data>
 		</dict>
 		<key>Headers/RongIMKitExtensionModule.h</key>

Разница между файлами не показана из-за своего большого размера
+ 232 - 183
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/Headers/RCIMClient.h


+ 0 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/Headers/RongIMLibHeader.h

@@ -14,6 +14,5 @@
 #import <RongDiscussion/RongDiscussion.h>
 #import <RongPublicService/RongPublicService.h>
 #import <RongCustomerService/RongCustomerService.h>
-#import <RongLocation/RongLocation.h>
 
 #endif /* RongIMLibHeader_h */

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/RongIMLib


+ 7 - 7
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-arm64_armv7/RongIMLib.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/RCIMClient.h</key>
 		<data>
-		+CE6yBTweXygS+PCPaWpj8I6BHc=
+		a5DwyWM8vft+lPBFlzl/JERh9ro=
 		</data>
 		<key>Headers/RongIMLib.h</key>
 		<data>
@@ -14,11 +14,11 @@
 		</data>
 		<key>Headers/RongIMLibHeader.h</key>
 		<data>
-		ZAcU3HutLbon2TalM+InNpP/Dzo=
+		K3VY4dj49D9fWYiX13o+U4wVSIs=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		caxooRWY/ovMA5ujUoBlPhywdlI=
+		aKbuZwCP38iY2ry0RZpAMeLH8OM=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -31,11 +31,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			+CE6yBTweXygS+PCPaWpj8I6BHc=
+			a5DwyWM8vft+lPBFlzl/JERh9ro=
 			</data>
 			<key>hash2</key>
 			<data>
-			5YGTtLa+BwwwEorI5kJO2Un4M++llw5Kf0XlP+5OFsM=
+			yVUxaMhKYelzzNUvRGIc75PWaDNLj6MkVCaw3AaWmUY=
 			</data>
 		</dict>
 		<key>Headers/RongIMLib.h</key>
@@ -53,11 +53,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ZAcU3HutLbon2TalM+InNpP/Dzo=
+			K3VY4dj49D9fWYiX13o+U4wVSIs=
 			</data>
 			<key>hash2</key>
 			<data>
-			6GXAPieUqTktH4lxtZL7VyN66ibmMRAM02Jeh+d4Pd0=
+			g741YjSFJIleQqjIfRkv2SNpzqOtwPChH362fYfNSb4=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

Разница между файлами не показана из-за своего большого размера
+ 232 - 183
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/Headers/RCIMClient.h


+ 0 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/Headers/RongIMLibHeader.h

@@ -14,6 +14,5 @@
 #import <RongDiscussion/RongDiscussion.h>
 #import <RongPublicService/RongPublicService.h>
 #import <RongCustomerService/RongCustomerService.h>
-#import <RongLocation/RongLocation.h>
 
 #endif /* RongIMLibHeader_h */

BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/Info.plist


BIN
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/RongIMLib


+ 7 - 7
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLib.xcframework/ios-i386_x86_64-simulator/RongIMLib.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/RCIMClient.h</key>
 		<data>
-		+CE6yBTweXygS+PCPaWpj8I6BHc=
+		a5DwyWM8vft+lPBFlzl/JERh9ro=
 		</data>
 		<key>Headers/RongIMLib.h</key>
 		<data>
@@ -14,11 +14,11 @@
 		</data>
 		<key>Headers/RongIMLibHeader.h</key>
 		<data>
-		ZAcU3HutLbon2TalM+InNpP/Dzo=
+		K3VY4dj49D9fWYiX13o+U4wVSIs=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		5wsJI7jNwBw4AAhTrw+XMRxMY9Q=
+		0rTB3p7hVsQrZIy7YkC2ONqoOTs=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -31,11 +31,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			+CE6yBTweXygS+PCPaWpj8I6BHc=
+			a5DwyWM8vft+lPBFlzl/JERh9ro=
 			</data>
 			<key>hash2</key>
 			<data>
-			5YGTtLa+BwwwEorI5kJO2Un4M++llw5Kf0XlP+5OFsM=
+			yVUxaMhKYelzzNUvRGIc75PWaDNLj6MkVCaw3AaWmUY=
 			</data>
 		</dict>
 		<key>Headers/RongIMLib.h</key>
@@ -53,11 +53,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			ZAcU3HutLbon2TalM+InNpP/Dzo=
+			K3VY4dj49D9fWYiX13o+U4wVSIs=
 			</data>
 			<key>hash2</key>
 			<data>
-			6GXAPieUqTktH4lxtZL7VyN66ibmMRAM02Jeh+d4Pd0=
+			g741YjSFJIleQqjIfRkv2SNpzqOtwPChH362fYfNSb4=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>

+ 8 - 8
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/Info.plist

@@ -6,31 +6,31 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>ios-i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>RongIMLibCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
-				<string>armv7</string>
+				<string>i386</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_armv7</string>
 			<key>LibraryPath</key>
 			<string>RongIMLibCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>i386</string>
-				<string>x86_64</string>
+				<string>arm64</string>
+				<string>armv7</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

+ 5 - 3
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCAMRDataConverter.h

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  AMR 格式与 WAV 格式音频转换工具类
  */
@@ -38,7 +39,7 @@
  @param data    AMR 格式的音频数据,可以是 AMR-NB 或者 AMR-WB 格式
  @return        WAV 格式的音频数据
  */
-- (NSData *)decodeAMRToWAVE:(NSData *)data;
+- (nullable NSData *)decodeAMRToWAVE:(NSData *)data;
 
 /*!
  将 AMR 格式的音频数据转化为 WAV 格式的音频数据
@@ -46,7 +47,7 @@
  @param data    AMR格式的音频数据,必须是 AMR-NB 的格式
  @return        WAV格式的音频数据
  */
-- (NSData *)decodeAMRToWAVEWithoutHeader:(NSData *)data;
+- (nullable NSData *)decodeAMRToWAVEWithoutHeader:(NSData *)data;
 
 /*!
  将 WAV 格式的音频数据转化为 AMR 格式的音频数据(8KHz/16KHz 采样)
@@ -55,8 +56,9 @@
  @return                AMR-NB/AMR-WB 格式的音频数据
  @discussion 如果采样率为 8KHz 则返回 AMR-NB 格式数据,如果采样率为 16KHz 则返回 AMR-WB 格式数据。
  */
-- (NSData *)encodeWAVEToAMR:(NSData *)data;
+- (nullable NSData *)encodeWAVEToAMR:(NSData *)data;
 
 @end
 
+SEC_ASSUME_NONNULL_END
 #endif

+ 34 - 27
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCAndroidConfig.h

@@ -35,64 +35,71 @@ FOUNDATION_EXPORT RCImportanceHw const RCImportanceHwLow;
  */
 @property (nonatomic, copy) NSString *notificationId;
 
+#pragma mark - 小米
+
 /*!
  小米的渠道 ID
  该条消息针对小米使用的推送渠道,如开发者集成了小米推送,需要指定 channelId 时,可向 Android 端研发人员获取,channelId 由开发者自行创建。
  */
-@property (nonatomic, copy) NSString *channelIdMi;
+@property (nonatomic, copy, nullable) NSString *channelIdMi;
 
 /*!
- 华为的渠道 ID
- 该条消息针对华为使用的推送渠道,如开发者集成了华为推送,需要指定 channelId 时,可向 Android 端研发人员获取,channelId 由开发者自行创建
+ 小米 Large icon 链接
+ Large icon 可以出现在大图版和多字版消息中,显示在右边。国内版仅 MIUI12 以上版本支持,以下版本均不支持;国际版支持。图片要求:大小 120 * 120px,格式为 png 或者 jpg 格式
  */
-@property (nonatomic, copy) NSString *channelIdHW;
+@property (nonatomic, copy, nullable) NSString *miLargeIconUrl;
 
+#pragma mark - 华为
 /*!
- OPPO 的渠道 ID
- 该条消息针对 OPPO 使用的推送渠道,如开发者集成了 OPPO 推送,需要指定 channelId 时,可向 Android 端研发人员获取,channelId 由开发者自行创建。
+ 华为的渠道 ID
+ 该条消息针对华为使用的推送渠道,如开发者集成了华为推送,需要指定 channelId 时,可向 Android 端研发人员获取,channelId 由开发者自行创建。
  */
-@property (nonatomic, copy) NSString *channelIdOPPO;
+@property (nonatomic, copy, nullable) NSString *channelIdHW;
 
 /*!
- VIVO 推送通道类型
- 开发者集成了 VIVO 推送,需要指定推送类型时,可进行设置。
- 目前可选值 "0"(运营消息) 和  "1"(系统消息)
+ 华为推送消息级别
  */
-@property (nonatomic, copy) NSString *typeVivo;
+@property (nonatomic, copy, nullable) RCImportanceHw importanceHW;
 
 /*!
- FCM 通知类型推送时所使用的分组 id
+ 华为通知栏消息右侧大图标 URL
+ 如果不设置,则不展示通知栏右侧图标。URL使用的协议必须是HTTPS协议,取值样例:https://example.com/image.png。
+ 图标文件须小于 512KB,图标建议规格大小:40dp x 40dp,弧角大小为 8dp,超出建议规格大小的图标会存在图片压缩或显示不全的情况。
  */
-@property (nonatomic, copy) NSString *fcmCollapseKey;
+@property (nonatomic, copy, nullable) NSString *hwImageUrl;
 
+#pragma mark - OPPO
 /*!
- FCM 通知类型的推送所使用的通知图片 url
+ OPPO 的渠道 ID
+ 该条消息针对 OPPO 使用的推送渠道,如开发者集成了 OPPO 推送,需要指定 channelId 时,可向 Android 端研发人员获取,channelId 由开发者自行创建。
  */
-@property (nonatomic, copy) NSString *fcmImageUrl;
+@property (nonatomic, copy, nullable) NSString *channelIdOPPO;
+
 
+#pragma mark - VIVO
 /*!
- 华为推送消息级别
+ VIVO 推送通道类型
+ 开发者集成了 VIVO 推送,需要指定推送类型时,可进行设置。
+ 目前可选值 "0"(运营消息) 和  "1"(系统消息)
  */
-@property (nonatomic, copy) RCImportanceHw importanceHW;
+@property (nonatomic, copy, nullable) NSString *typeVivo;
 
+#pragma mark - FCM
 /*!
- 华为通知栏消息右侧大图标 URL
- 如果不设置,则不展示通知栏右侧图标。URL使用的协议必须是HTTPS协议,取值样例:https://example.com/image.png。
- 图标文件须小于 512KB,图标建议规格大小:40dp x 40dp,弧角大小为 8dp,超出建议规格大小的图标会存在图片压缩或显示不全的情况。
+ FCM 通知的频道 ID
+ 该应用程序必须使用此频道 ID 创建一个频道,然后才能收到带有该频道 ID 的任何通知。如果您未在请求中发送此频道 ID,或者如果应用尚未创建提供的频道 ID,则 FCM 使用应用清单中指定的频道 ID。
  */
-@property (nonatomic, copy) NSString *hwImageUrl;
+@property (nonatomic, copy, nullable) NSString *fcmChannelId;
 
 /*!
- 小米 Large icon 链接
- Large icon 可以出现在大图版和多字版消息中,显示在右边。国内版仅 MIUI12 以上版本支持,以下版本均不支持;国际版支持。图片要求:大小 120 * 120px,格式为 png 或者 jpg 格式。
+ FCM 通知类型推送时所使用的分组 id
  */
-@property (nonatomic, copy) NSString *miLargeIconUrl;
+@property (nonatomic, copy, nullable) NSString *fcmCollapseKey;
 
 /*!
- FCM 通知的频道 ID
- 该应用程序必须使用此频道 ID 创建一个频道,然后才能收到带有该频道 ID 的任何通知。如果您未在请求中发送此频道 ID,或者如果应用尚未创建提供的频道 ID,则 FCM 使用应用清单中指定的频道 ID。
+ FCM 通知类型的推送所使用的通知图片 url
  */
-@property (nonatomic, copy) NSString *fcmChannelId;
+@property (nonatomic, copy, nullable) NSString *fcmImageUrl;
 
 @end
 

+ 20 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCBlockedMessageInfo.h

@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  频道 ID
  */
-@property (nonatomic, copy) NSString *channelId;
+@property (nonatomic, copy, nullable) NSString *channelId;
 
 /**
  *  被拦截的消息 UID
@@ -44,7 +44,25 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  *  附加信息
  */
-@property (nonatomic, copy) NSString *extra;
+@property (nonatomic, copy, nullable) NSString *extra;
+
+/*!
+ 消息的发送时间(Unix 时间戳、毫秒)
+ */
+@property (nonatomic, assign) long long sentTime;
+
+/**
+ *  消息源触发类型。0默认,原始消息;1消息扩展;2消息修改
+ */
+@property (nonatomic, assign) NSInteger sourceType;
+
+/**
+ *  源内容 Json 字符串。sourceType 为 1、2 时返回;1扩展内容,2消息内容
+ *  sourceType 为 0,sourceContent 内容为 nil
+ *  sourceType 为 1,sourceContent 是扩展内容,示例 {"mid":"xxx-xxx-xxx-xxx","put":{"key":"敏感词"}}
+ *  sourceType 为 2,sourceContent 是消息修改后内容,示例 {"content":"敏感词"}
+ */
+@property (nonatomic, copy) NSString *sourceContent;
 
 /*!
  RCBlockedMessageInfo 初始化方法

Разница между файлами не показана из-за своего большого размера
+ 203 - 178
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCChannelClient.h


+ 5 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCCommandMessage.h

@@ -12,6 +12,7 @@
  */
 #define RCCommandMessageIdentifier @"RC:CmdMsg"
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  命令消息类
 
@@ -32,7 +33,7 @@
 
  @discussion 命令的扩展数据,可以为任意字符串,如存放您定义的json数据。
  */
-@property (nonatomic, copy) NSString *data;
+@property (nonatomic, copy, nullable) NSString *data;
 
 /*!
  初始化命令消息
@@ -41,6 +42,8 @@
  @param data    命令的扩展数据
  @return        命令消息对象
  */
-+ (instancetype)messageWithName:(NSString *)name data:(NSString *)data;
++ (instancetype)messageWithName:(NSString *)name data:(nullable NSString *)data;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 5 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCCommandNotificationMessage.h

@@ -17,6 +17,7 @@
  */
 #define RCCommandNotificationMessageIdentifier @"RC:CmdNtf"
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  命令提醒消息类
 
@@ -37,7 +38,7 @@
 
  @discussion 命令提醒消息的扩展数据,可以为任意字符串,如存放您定义的 json 数据。
  */
-@property (nonatomic, copy) NSString *data;
+@property (nonatomic, copy, nullable) NSString *data;
 
 /*!
  初始化命令提醒消息
@@ -46,6 +47,8 @@
  @param data    命令的扩展数据
  @return        命令提醒消息对象
  */
-+ (instancetype)notificationWithName:(NSString *)name data:(NSString *)data;
++ (instancetype)notificationWithName:(NSString *)name data:(nullable NSString *)data;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 4 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCContactNotificationMessage.h

@@ -32,6 +32,7 @@
  */
 #define ContactNotificationMessage_ContactOperationRejectResponse @"RejectResponse"
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  好友请求消息类
 
@@ -84,6 +85,8 @@
                              sourceUserId:(NSString *)sourceUserId
                              targetUserId:(NSString *)targetUserId
                                   message:(NSString *)message
-                                    extra:(NSString *)extra;
+                                    extra:(nullable NSString *)extra;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 31 - 12
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversation.h

@@ -13,6 +13,8 @@
 #import "RCMessageContent.h"
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class RCReadReceiptInfo, RCGroupReadReceiptInfoV2, RCMessageConfig;
 /*!
  会话类
@@ -34,12 +36,12 @@
 /*!
  该会话的业务标识,长度限制 20 字符
  */
-@property (nonatomic, copy) NSString *channelId;
+@property (nonatomic, copy, nullable) NSString *channelId;
 
 /*!
  会话的标题
  */
-@property (nonatomic, copy) NSString *conversationTitle;
+@property (nonatomic, copy, nullable) NSString *conversationTitle;
 
 /*!
  会话中的未读消息数量
@@ -77,17 +79,17 @@
 /*!
  会话中存在的草稿
  */
-@property (nonatomic, copy) NSString *draft;
+@property (nonatomic, copy, nullable) NSString *draft;
 
 /*!
  会话中最后一条消息的类型名
  */
-@property (nonatomic, copy) NSString *objectName;
+@property (nonatomic, copy, nullable) NSString *objectName;
 
 /*!
  会话中最后一条消息的发送者用户 ID
  */
-@property (nonatomic, copy) NSString *senderUserId;
+@property (nonatomic, copy, nullable) NSString *senderUserId;
 
 /*!
  会话中最后一条消息的消息 ID
@@ -97,7 +99,7 @@
 /*!
  会话中最后一条消息的内容
  */
-@property (nonatomic, strong) RCMessageContent *lastestMessage;
+@property (nonatomic, strong, nullable) RCMessageContent *lastestMessage;
 
 /*!
  会话中最后一条消息的方向
@@ -110,14 +112,14 @@
  @discussion 此字段存放最后一条消息内容中未编码的 json 数据。
  SDK 内置的消息,如果消息解码失败,默认会将消息的内容存放到此字段;如果编码和解码正常,此字段会置为 nil。
  */
-@property (nonatomic, strong) NSDictionary *jsonDict;
+@property (nonatomic, strong, nullable) NSDictionary *jsonDict;
 
 /*!
  最后一条消息的全局唯一 ID
 
  @discussion 服务器消息唯一 ID(在同一个Appkey下全局唯一)
  */
-@property (nonatomic, copy) NSString *lastestMessageUId;
+@property (nonatomic, copy, nullable) NSString *lastestMessageUId;
 
 /*!
  会话中是否存在被 @ 的消息
@@ -141,19 +143,19 @@
 /*!
  最后一条消息的阅读回执状态
  */
-@property (nonatomic, strong) RCReadReceiptInfo *latestMessageReadReceiptInfo;
+@property (nonatomic, strong, nullable) RCReadReceiptInfo *latestMessageReadReceiptInfo;
 
 /*!
  最后一条消息的群阅读回执状态
  @discussion 如果是调用 RCGroupReadReceiptV2Manager 中方法实现群已读回执功能,此参数才有效,否则请使用 readReceiptInfo 属性获取阅读回执状态
  @discussion 如果使用 IMKit,请用 readReceiptInfo 属性
  */
-@property (nonatomic, strong) RCGroupReadReceiptInfoV2 *latestMessageGroupReadReceiptInfoV2;
+@property (nonatomic, strong, nullable) RCGroupReadReceiptInfoV2 *latestMessageGroupReadReceiptInfoV2;
 
 /*!
  最后一条消息的消息配置
  */
-@property (nonatomic, strong) RCMessageConfig *latestMessageMessageConfig;
+@property (nonatomic, strong, nullable) RCMessageConfig *latestMessageMessageConfig;
 
 /*!
  最后一条消息是否可以包含扩展信息
@@ -169,10 +171,27 @@
  @discussion 扩展信息只支持单聊和群组,其它会话类型不能设置扩展信息
  @discussion 默认消息扩展字典 key 长度不超过 32 ,value 长度不超过 4096 ,单次设置扩展数量最大为 20,消息的扩展总数不能超过 300
 */
-@property (nonatomic, strong) NSDictionary<NSString *, NSString *> *latestMessageExpansion;
+@property (nonatomic, strong, nullable) NSDictionary<NSString *, NSString *> *latestMessageExpansion;
 
 /*!
  免打扰级别
  */
 @property (nonatomic, assign) RCPushNotificationLevel notificationLevel;
+
+/*!
+ 超级群频道类型,只有 ConversationType 为超级群时该字段有效, 非超级群时为0
+ */
+@property (nonatomic, assign)  RCUltraGroupChannelType channelType;
+
+/*!
+会话中第一条未读消息时间戳(Unix时间戳、毫秒)
+
+仅支持 超级群会话
+ @Since 5.2.5
+*/
+@property (nonatomic, assign) long long firstUnreadMsgSendTime;
+
+
 @end
+
+NS_ASSUME_NONNULL_END

+ 61 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversationChannelProtocol.h

@@ -8,6 +8,12 @@
 
 #ifndef RCConversationChannelProtocol_h
 #define RCConversationChannelProtocol_h
+
+#import <RongIMLibCore/RCUltraGroupChannelChangeInfo.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RCUserTypingStatus;
 @protocol RCConversationChannelMessageReceiptDelegate <NSObject>
 @optional
 /*!
@@ -56,7 +62,7 @@
 - (void)onTypingStatusChanged:(RCConversationType)conversationType
                      targetId:(NSString *)targetId
                     channelId:(NSString *)channelId
-                       status:(NSArray *)userTypingStatusList;
+                       status:(nullable NSArray<RCUserTypingStatus *> *)userTypingStatusList;
 @end
 
 #pragma mark - 超级群会话代理
@@ -66,4 +72,58 @@
 //超级群会话列表与会话最后一条消息同步完成
 - (void)ultraGroupConversationListDidSync;
 @end
+
+@protocol RCUltraGroupChannelDelegate <NSObject>
+
+/*!
+ 超级群类型变更通知
+ 1. 公有频道变私有频道时,公有频道所有用户会收到该通知
+   a. 在私有频道白名单内的用户,收到的变更类型是 PublicToPrivate(公有频道变私有频道前,可以提前将用户加入私有频道白名单)
+   b. 不在私有频道白名单的其他用户,变更类型为 PublicToPrivateUserNotIn
+
+ 2. 私有频道变公有频道时,私有频道白名单中的用户收到通知,变更类型为 PrivateToPublic
+
+ @param infoList        频道变更信息
+ @discussion
+ 当客户端收到频道变更时,会回调此接口,通知发生变化的会话频道列表。
+ 该功能仅支持超级群。
+ */
+- (void)ultraGroupChannelTypeDidChanged:(NSArray<RCUltraGroupChannelChangeTypeInfo *> *)infoList;
+
+/*!
+ 频道白名单用户被移除通知(当前仅支持私有频道)
+ 1. 公有频道时,将用户从私有频道白名单移除时,不通知
+ 2. 私有频道时,将用户从白名单移除时,仅通知私有频道所有用户,含被踢的用户
+ 3. 清理本地数据
+   a. 当被踢用户为当前用户时:用户本地会话删除,本地会话的消息保留
+   b. 当被踢用户为其他人时:不做任何处理
+
+ @param infoList        频道变更信息
+ @discussion
+ 当客户端收到用户被移除频道时,会回调此接口,通知发生变化的会话频道列表。
+ 该功能仅支持超级群。
+ */
+- (void)ultraGroupChannelUserDidKicked:(NSArray<RCUltraGroupChannelUserKickedInfo *> *)infoList;
+
+
+
+/*!
+ 删除频道通知,可以认为是频道解散。
+ 1. 公有频道时,删除频道通知频道中所有人
+ 2. 私有频道时,删除频道通知白名单中所有人
+ 3. 清理本地数据:用户本地会话删除,本地会话的消息保留
+
+ @param infoList        频道变更信息
+ @discussion
+ 当客户端收到频道解散时,会回调此接口,通知发生变化的会话频道列表。
+ 该功能仅支持超级群。
+ */
+- (void)ultraGroupChannelDidDisbanded:(NSArray<RCUltraGroupChannelDisbandedInfo *> *)infoList;
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+
 #endif /* RCConversationChannelProtocol_h */

+ 11 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversationStatusInfo.h

@@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
 /*!
  所属会话的业务标识
  */
-@property (nonatomic, copy) NSString *channelId;
+@property (nonatomic, copy, nullable) NSString *channelId;
 
 /*!
  会话状态改变的类型
@@ -50,12 +50,19 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) RCConversationStatusType conversationStatusType;
 
 /*!
- 如果 conversationStatusType  = RCConversationStatusType_Mute, conversationStatusvalue = 1
- 是提醒,conversationStatusvalue = 0 是免打扰。  如果 conversationStatusType  = RCConversationStatusType_Top,
- conversationStatusvalue = 0 是不置顶,conversationStatusvalue = 1 是置顶。
+ 如果 conversationStatusType  = RCConversationStatusType_Mute,conversationStatusvalue = 1 是提醒,conversationStatusvalue = 0 是免打扰。
+ 
+ 如果 conversationStatusType  = RCConversationStatusType_Top,conversationStatusvalue = 0 是不置顶,conversationStatusvalue = 1 是置顶。
 */
 @property (nonatomic, assign) int conversationStatusvalue;
 
+/*!
+ 会话免打扰类型
+ 
+ 当 conversationStatusType  = RCConversationStatusType_Mute 时,notificationLevel 值为有效值。
+*/
+@property (nonatomic, assign) RCPushNotificationLevel notificationLevel;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 1 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCConversationTagInfo.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "RCTagInfo.h"
+
 NS_ASSUME_NONNULL_BEGIN
 /*!
  会话所属的标签信息

Разница между файлами не показана из-за своего большого размера
+ 239 - 174
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCCoreClient.h


+ 4 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCDownloadItem.h

@@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param error 错误信息对象,成功时为 nil
  @param path 下载完成后文件的路径,此路径为相对路径,相对于沙盒根目录 NSHomeDirectory
  */
-- (void)downloadItem:(RCDownloadItem *)item didCompleteWithError:(NSError *)error filePath:(nullable NSString *)path;
+- (void)downloadItem:(RCDownloadItem *)item didCompleteWithError:(nullable NSError *)error filePath:(nullable NSString *)path;
 @end
 
 @interface RCDownloadItem : NSObject
@@ -79,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  文件对应的网络 URL
  */
-@property (nonatomic, strong, readonly) NSURL *URL;
+@property (nonatomic, strong, readonly, nullable) NSURL *URL;
 
 /**
  标识是否可恢复下载。 YES 表示可恢复,支持 Range。 NO 表示不支持 Range。
@@ -89,12 +89,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  下载任务的标识符
  */
-@property (nonatomic, copy, readonly) NSString *identify;
+@property (nonatomic, copy, readonly, nullable) NSString *identify;
 
 /**
  下载任务的代理对象
  */
-@property (nonatomic, weak) id<RCDownloadItemDelegate> delegate;
+@property (nonatomic, weak, nullable) id<RCDownloadItemDelegate> delegate;
 
 + (instancetype) new NS_UNAVAILABLE;
 

+ 8 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCFileMessage.h

@@ -12,6 +12,8 @@
  文件消息的类型名
  */
 #define RCFileMessageTypeIdentifier @"RC:FileMsg"
+
+NS_ASSUME_NONNULL_BEGIN
 /*!
  文件消息类
  
@@ -24,7 +26,7 @@
 /*!
  文件名
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy, nullable) NSString *name;
 
 /*!
  文件大小,单位为 Byte
@@ -34,17 +36,17 @@
 /*!
  文件类型
  */
-@property (nonatomic, copy) NSString *type;
+@property (nonatomic, copy, nullable) NSString *type;
 
 /*!
  文件的网络地址
  */
-@property (nonatomic, copy) NSString *fileUrl;
+@property (nonatomic, copy, nullable) NSString *fileUrl;
 
 /*!
  文件的本地路径
  */
-@property (nonatomic, copy) NSString *localPath;
+@property (nonatomic, copy, nullable) NSString *localPath;
 
 /*!
  初始化文件消息
@@ -55,3 +57,5 @@
 + (instancetype)messageWithFile:(NSString *)localPath;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 6 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCFileUtility.h

@@ -14,6 +14,8 @@
 
 #import "RCStatusDefine.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCFileUtility : NSObject
 
 /*!
@@ -94,7 +96,7 @@
 
  @return 文件本地存储路径
  */
-+ (NSString *)getFileLocalPath:(NSString *)fileUri;
++ (nullable NSString *)getFileLocalPath:(NSString *)fileUri;
 
 /*!
  关联文件远端 URL 和本地路径
@@ -105,4 +107,7 @@
  */
 + (NSString *)getSightCachePath:(NSString *)sightUrl;
 @end
+
+NS_ASSUME_NONNULL_END
+
 #endif

+ 9 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCFwLog.h

@@ -64,6 +64,8 @@ typedef NS_OPTIONS(NSUInteger, RCLogType) {
     RC_Type_RTC = 1 << 12  // RTC.
 };
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCFwLog : NSObject
 
 // should be call init first, otherwise getInstance will return nil.
@@ -75,11 +77,14 @@ typedef NS_OPTIONS(NSUInteger, RCLogType) {
 + (void)setUserId:(NSString *)userId;
 + (void)setLogListener:(void (^)(NSString *log))logBlock;
 + (void)setConsoleLogLevel:(RCFwLogLevel)level;
-+ (NSString *)getIpWithHost:(NSString *)hostName;
+/// 网络状态 100% lost 时, 此方法会阻塞 30s,切记不要在主线程直接调用
++ (nullable NSString *)getIpWithHost:(NSString *)hostName;
+/// 异步获取 ip 地址,内部有切线程处理,子线程执行,主线程回调 callback
++ (void)getIpWithHost:(NSString *)hostName callback:(void (^)(NSString * ipString))callback;
 + (void)setRcDebugLogLevel:(NSInteger)rcDebugLogLevel;
 + (void)setRcDebugLogMaxSize:(long long)rcDebugLogMaxSize;
 + (void)startRealTimelog;
-- (void)uploadLog:(void (^)(int code))errorBlock;
+- (void)uploadLog:(nullable void (^)(int code))errorBlock;
 - (void)uploadDebugLog;
 - (void)write:(RCFwLogLevel)level
          type:(RCLogType)type
@@ -92,3 +97,5 @@ typedef NS_OPTIONS(NSUInteger, RCLogType) {
          keys:(NSArray *)keys
        values:(NSArray *)vals;
 @end
+
+NS_ASSUME_NONNULL_END

+ 5 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroup.h

@@ -12,6 +12,7 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  群组信息类
  */
@@ -30,7 +31,7 @@
 /*!
  群组头像的 URL
  */
-@property (nonatomic, copy) NSString *portraitUri;
+@property (nonatomic, copy, nullable) NSString *portraitUri;
 
 /*!
  群组信息的初始化方法
@@ -40,6 +41,8 @@
  @param portraitUri     群组头像的 URL
  @return                群组信息对象
  */
-- (instancetype)initWithGroupId:(NSString *)groupId groupName:(NSString *)groupName portraitUri:(NSString *)portraitUri;
+- (instancetype)initWithGroupId:(NSString *)groupId groupName:(NSString *)groupName portraitUri:(nullable NSString *)portraitUri;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 3 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupMessageReaderV2.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
 /**
  已读用户对象
  */
@@ -24,3 +25,5 @@
 @property (nonatomic, assign) long long readTime;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 7 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupReadReceiptInfoV2.h

@@ -7,7 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "RCGroupMessageReaderV2.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RCGroupMessageReaderV2;
 @interface RCGroupReadReceiptInfoV2 : NSObject
 /**
  是否已经发送回执
@@ -17,7 +20,7 @@
 /*!
  发送回执的用户 ID 列表
  */
-@property (nonatomic, strong) NSArray <RCGroupMessageReaderV2 *> *readerList;
+@property (nonatomic, strong, nullable) NSArray <RCGroupMessageReaderV2 *> *readerList;
 
 /**
  *  已读人数
@@ -30,3 +33,5 @@
 @property (nonatomic, assign) int totalCount;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 11 - 6
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupReadReceiptV2Manager.h

@@ -10,6 +10,9 @@
 #import "RCGroupMessageReaderV2.h"
 #import "RCMessage.h"
 #import "RCGroupReadReceiptV2Protocol.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCGroupReadReceiptV2Manager : NSObject
 /*!
  获取单例类
@@ -19,7 +22,7 @@
 /*!
  群已读回执代理
  */
-@property (nonatomic, weak) id<RCGroupReadReceiptV2Delegate> groupReadReceiptV2Delegate;
+@property (nonatomic, weak, nullable) id<RCGroupReadReceiptV2Delegate> groupReadReceiptV2Delegate;
 
 /*!
  发送阅读回执
@@ -37,10 +40,10 @@
  */
 - (void)sendReadReceiptResponse:(RCConversationType)conversationType
                        targetId:(NSString *)targetId
-                      channelId:(NSString *)channelId
+                      channelId:(nullable NSString *)channelId
                     messageList:(NSArray<RCMessage *> *)messageList
-                        success:(void (^)(void))successBlock
-                          error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                        success:(nullable void (^)(void))successBlock
+                          error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 
 /*!
  获取群消息已读用户列表
@@ -54,6 +57,8 @@
  @remarks 高级功能
  */
 - (void)getGroupMessageReaderList:(RCMessage *)message
-                          success:(void (^)(NSArray <RCGroupMessageReaderV2 *> *readerList, int totalCount))successBlock
-                            error:(void (^)(RCErrorCode nErrorCode))errorBlock;
+                          success:(nullable void (^)(NSArray <RCGroupMessageReaderV2 *> * _Nullable readerList, int totalCount))successBlock
+                            error:(nullable void (^)(RCErrorCode nErrorCode))errorBlock;
 @end
+
+NS_ASSUME_NONNULL_END

+ 5 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCGroupReadReceiptV2Protocol.h

@@ -9,6 +9,8 @@
 #ifndef RCGroupReadReceiptV2Protocol_h
 #define RCGroupReadReceiptV2Protocol_h
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol RCGroupReadReceiptV2Delegate <NSObject>
 
 /*!
@@ -22,11 +24,13 @@
   */
 - (void)onMessageReceiptResponse:(RCConversationType)conversationType
                         targetId:(NSString *)targetId
-                       channelId:(NSString *)channelId
+                       channelId:(nullable NSString *)channelId
                       messageUId:(NSString *)messageUId
                        readCount:(int)readCount
                       totalCount:(int)totalCount;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 #endif /* RCGroupReadReceiptV2Protocol_h */

+ 2 - 2
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCHistoryMessageOption.h

@@ -13,10 +13,10 @@
  RCHistoryMessageOrderDesc - 降序
  RCHistoryMessageOrderAsc - 升序
  */
-typedef enum : NSUInteger {
+typedef NS_ENUM(NSUInteger, RCHistoryMessageOrder) {
     RCHistoryMessageOrderDesc = 0,
     RCHistoryMessageOrderAsc,
-} RCHistoryMessageOrder;
+};
 
 @interface RCHistoryMessageOption : NSObject
 /**

+ 10 - 6
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCIMClientProtocol.h

@@ -9,7 +9,9 @@
 #ifndef RCIMClientProtocol_h
 #define RCIMClientProtocol_h
 
-@class RCMessage;
+NS_ASSUME_NONNULL_BEGIN
+
+@class RCMessage, RCUserTypingStatus;
 @class RCConversationStatusInfo;
 @class RCBlockedMessageInfo;
 @class RCUltraGroupTypingStatusInfo;
@@ -41,7 +43,7 @@
  您可以根据left数量来优化您的App体验和性能,比如收到大量消息时等待left为0再刷新UI。
  object为您在设置消息接收监听时的key值。
  */
-- (void)onReceived:(RCMessage *)message left:(int)nLeft object:(id)object;
+- (void)onReceived:(RCMessage *)message left:(int)nLeft object:(nullable id)object;
 
 /**
  接收消息的回调方法
@@ -60,7 +62,7 @@
  */
 - (void)onReceived:(RCMessage *)message
               left:(int)nLeft
-            object:(id)object
+            object:(nullable id)object
            offline:(BOOL)offline
         hasPackage:(BOOL)hasPackage;
 
@@ -76,7 +78,7 @@
 
  @discussion 被撤回的消息会变更为RCRecallNotificationMessage,App需要在UI上刷新这条消息。
  */
-- (void)onMessageRecalled:(long)messageId __deprecated_msg("已废弃,请使用 messageDidRecall:");;
+- (void)onMessageRecalled:(long)messageId __deprecated_msg("Use messageDidRecall: instead");;
 
 /*!
  消息被撤回的回调方法
@@ -112,7 +114,7 @@
 - (void)onMessageReceiptResponse:(RCConversationType)conversationType
                         targetId:(NSString *)targetId
                       messageUId:(NSString *)messageUId
-                      readerList:(NSMutableDictionary *)userIdList;
+                      readerList:(nullable NSMutableDictionary *)userIdList;
 @end
 
 #pragma mark - 发送消息被拦截监听器
@@ -177,7 +179,7 @@
  */
 - (void)onTypingStatusChanged:(RCConversationType)conversationType
                      targetId:(NSString *)targetId
-                       status:(NSArray *)userTypingStatusList;
+                       status:(nullable NSArray<RCUserTypingStatus *> *)userTypingStatusList;
 
 @end
 
@@ -392,4 +394,6 @@
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 #endif /* RCIMClientProtocol_h */

+ 13 - 6
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCImageMessage.h

@@ -18,6 +18,7 @@
  */
 #define RCImageMessageTypeIdentifier @"RC:ImgMsg"
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  图片消息类
 
@@ -33,18 +34,22 @@
  图片消息的 URL 地址
 
  @discussion 发送方此字段为图片的本地路径,接收方此字段为网络 URL 地址。
+ 
+ @attention
+ 不再允许外部赋值,为只读属性
+ 本地地址使用 localPath, 远端地址使用 remoteUrl
  */
-@property (nonatomic, copy) NSString *imageUrl;
+@property (nonatomic, copy, readonly, nullable) NSString *imageUrl;
 
 /*!
  图片的本地路径
  */
-@property (nonatomic, copy) NSString *localPath;
+@property (nonatomic, copy, nullable) NSString *localPath;
 
 /*!
  图片消息的缩略图
  */
-@property (nonatomic, strong) UIImage *thumbnailImage;
+@property (nonatomic, strong, nullable) UIImage *thumbnailImage;
 
 /*!
  是否发送原图
@@ -56,12 +61,12 @@
 /*!
  图片消息的附加信息
  */
-@property (nonatomic, copy) NSString *extra;
+@property (nonatomic, copy, nullable) NSString *extra;
 
 /*!
  图片消息的原始图片信息
  */
-@property (nonatomic, strong) UIImage *originalImage;
+@property (nonatomic, strong, nullable) UIImage *originalImage;
 
 /*!
  图片消息的原始图片信息
@@ -69,7 +74,7 @@
  发送成功之后基于减少内存的考虑,该字段不再保存原始数据
  发送成功之后请优先使用 localPath 与 remoteUrl 进行展示
  */
-@property (nonatomic, strong, readonly) NSData *originalImageData;
+@property (nonatomic, strong, readonly, nullable) NSData *originalImageData;
 
 /*!
  初始化图片消息
@@ -102,3 +107,5 @@
 + (instancetype)messageWithImageData:(NSData *)imageData;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 4 - 1
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCInformationNotificationMessage.h

@@ -17,6 +17,7 @@
  */
 #define RCInformationNotificationMessageIdentifier @"RC:InfoNtf"
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  通知消息类
 
@@ -38,6 +39,8 @@
  @param extra   通知的附加信息
  @return        通知消息对象
  */
-+ (instancetype)notificationWithMessage:(NSString *)message extra:(NSString *)extra;
++ (instancetype)notificationWithMessage:(NSString *)message extra:(nullable NSString *)extra;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 6 - 3
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMediaMessageContent.h

@@ -8,6 +8,7 @@
 
 #import "RCMessageContent.h"
 
+NS_ASSUME_NONNULL_BEGIN
 /**
  媒体类型消息的父类
 
@@ -21,15 +22,17 @@
 /**
  媒体内容的本地路径(此属性必须有值)
  */
-@property (nonatomic, copy) NSString *localPath;
+@property (nonatomic, copy, nullable) NSString *localPath;
 
 /**
  媒体内容上传服务器后的网络地址(上传成功后 SDK 会为该属性赋值)
  */
-@property (nonatomic, copy) NSString *remoteUrl;
+@property (nonatomic, copy, nullable) NSString *remoteUrl;
 
 /**
  媒体内容的文件名(如不传使用 SDK 中 downloadMediaMessage 方法下载后会默认生成一个名称)
  */
-@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy, nullable) NSString *name;
 @end
+
+NS_ASSUME_NONNULL_END

+ 7 - 4
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMentionedInfo.h

@@ -9,6 +9,7 @@
 #import "RCStatusDefine.h"
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
 /*!
  消息中的 @ 提醒信息对象
  */
@@ -24,12 +25,12 @@
 
  @discussion 如果 type 是 @ 所有人,则可以传 nil
  */
-@property (nonatomic, strong) NSArray<NSString *> *userIdList;
+@property (nonatomic, strong, nullable) NSArray<NSString *> *userIdList;
 
 /*!
  包含 @ 提醒的消息,本地通知和远程推送显示的内容
  */
-@property (nonatomic, copy) NSString *mentionedContent;
+@property (nonatomic, copy, nullable) NSString *mentionedContent;
 
 /*!
  是否 @ 了我
@@ -46,7 +47,9 @@
  @return @ 提醒信息的对象
  */
 - (instancetype)initWithMentionedType:(RCMentionedType)type
-                           userIdList:(NSArray *)userIdList
-                     mentionedContent:(NSString *)mentionedContent;
+                           userIdList:(nullable NSArray<NSString *> *)userIdList
+                     mentionedContent:(nullable NSString *)mentionedContent;
 
 @end
+
+NS_ASSUME_NONNULL_END

+ 18 - 13
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMessage.h

@@ -19,6 +19,8 @@
 #import "RCMessageConfig.h"
 #import "RCMessagePushConfig.h"
 #import "RCGroupReadReceiptInfoV2.h"
+
+NS_ASSUME_NONNULL_BEGIN
 /*!
  消息实体类
 
@@ -39,7 +41,7 @@
 /*!
  所属会话的业务标识,长度限制 20 字符
  */
-@property (nonatomic, copy) NSString *channelId;
+@property (nonatomic, copy, nullable) NSString *channelId;
 
 /*!
  消息的 ID
@@ -56,15 +58,15 @@
 /*!
  消息的发送者 ID
  */
-@property (nonatomic, copy) NSString *senderUserId;
+@property (nonatomic, copy, nullable) NSString *senderUserId;
 
 /*!
- 消息的接收状态
+ 消息的接收状态(针对接收的消息生效)
  */
 @property (nonatomic, assign) RCReceivedStatus receivedStatus;
 
 /*!
- 消息的发送状态
+ 消息的发送状态(针对发送的消息生效)
  */
 @property (nonatomic, assign) RCSentStatus sentStatus;
 
@@ -81,36 +83,36 @@
 /*!
  消息的类型名
  */
-@property (nonatomic, copy) NSString *objectName;
+@property (nonatomic, copy, nullable) NSString *objectName;
 
 /*!
  消息的内容
  */
-@property (nonatomic, strong) RCMessageContent *content;
+@property (nonatomic, strong, nullable) RCMessageContent *content;
 
 /*!
  消息的附加字段
  */
-@property (nonatomic, copy) NSString *extra;
+@property (nonatomic, copy, nullable) NSString *extra;
 
 /*!
  全局唯一 ID
 
  @discussion 服务器消息唯一 ID(在同一个 Appkey 下全局唯一)
  */
-@property (nonatomic, copy) NSString *messageUId;
+@property (nonatomic, copy, nullable) NSString *messageUId;
 
 /*!
  阅读回执状态
  */
-@property (nonatomic, strong) RCReadReceiptInfo *readReceiptInfo;
+@property (nonatomic, strong, nullable) RCReadReceiptInfo *readReceiptInfo;
 
 /*!
  群阅读回执状态
  @discussion 如果是调用 RCGroupReadReceiptV2Manager 中方法实现群已读回执功能,此参数才有效,否则请使用 readReceiptInfo 属性获取阅读回执状态
  @discussion 如果使用 IMKit,请用 readReceiptInfo 属性
  */
-@property (nonatomic, strong) RCGroupReadReceiptInfoV2 *groupReadReceiptInfoV2;
+@property (nonatomic, strong, nullable) RCGroupReadReceiptInfoV2 *groupReadReceiptInfoV2;
 
 /*!
  消息配置
@@ -141,7 +143,7 @@
  @discussion 扩展信息只支持单聊和群组,其它会话类型不能设置扩展信息
  @discussion 默认消息扩展字典 key 长度不超过 32 ,value 长度不超过 4096 ,单次设置扩展数量最大为 20,消息的扩展总数不能超过 300
 */
-@property (nonatomic, strong) NSDictionary<NSString *, NSString *> *expansionDic;
+@property (nonatomic, strong, nullable) NSDictionary<NSString *, NSString *> *expansionDic;
 
 /*!
  消息是否被修改
@@ -175,7 +177,7 @@
  */
 - (instancetype)initWithType:(RCConversationType)conversationType
                     targetId:(NSString *)targetId
-                   channelId:(NSString *)channelId
+                   channelId:(nullable NSString *)channelId
                    direction:(RCMessageDirection)messageDirection
                      content:(RCMessageContent *)content;
 
@@ -193,6 +195,9 @@
                     targetId:(NSString *)targetId
                    direction:(RCMessageDirection)messageDirection
                    messageId:(long)messageId
-                     content:(RCMessageContent *)content __deprecated_msg("已废弃,请使用 initWithType:targetId:direction:content:");
+                     content:(RCMessageContent *)content __deprecated_msg("Use initWithType:targetId:direction:content: instead");
 @end
+
+NS_ASSUME_NONNULL_END
+
 #endif

+ 3 - 0
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMessageConfig.h

@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCMessageConfig : NSObject
 
 /*!
@@ -20,3 +22,4 @@
 
 @end
 
+NS_ASSUME_NONNULL_END

+ 12 - 7
KulexiuForStudent/Pods/RongCloudIM/RongCloudIM/RongIMLibCore.xcframework/ios-arm64_armv7/RongIMLibCore.framework/Headers/RCMessageContent.h

@@ -18,6 +18,8 @@
 #import "RCUserInfo.h"
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /*!
  消息内容的编解码协议
 
@@ -33,7 +35,7 @@
  @discussion
  消息内容通过此方法,将消息中的所有数据,编码成为json数据,返回的json数据将用于网络传输。
  */
-- (NSData *)encode;
+- (nullable NSData *)encode;
 
 /*!
  将json数据的内容反序列化,解码生成可用的消息内容
@@ -63,7 +65,7 @@
 
  @discussion 这里返回的关键内容列表将用于消息搜索,自定义消息必须要实现此接口才能进行搜索。
  */
-- (NSArray<NSString *> *)getSearchableWords;
+- (nullable NSArray<NSString *> *)getSearchableWords;
 @end
 
 /*!
@@ -102,7 +104,7 @@
  如果您使用IMKit,当会话的最后一条消息为自定义消息时,需要通过此方法获取在会话列表展现的内容摘要;
  当App在后台收到消息时,需要通过此方法获取在本地通知中展现的内容摘要。
  */
-- (NSString *)conversationDigest;
+- (nullable NSString *)conversationDigest;
 
 @end
 
@@ -121,12 +123,12 @@
  @discussion
  如果您使用IMKit,可以通过RCIM的enableMessageAttachUserInfo属性设置在每次发送消息中携带发送者的用户信息。
  */
-@property (nonatomic, strong) RCUserInfo *senderUserInfo;
+@property (nonatomic, strong, nullable) RCUserInfo *senderUserInfo;
 
 /*!
  消息中的 @ 提醒信息
  */
-@property (nonatomic, strong) RCMentionedInfo *mentionedInfo;
+@property (nonatomic, strong, nullable) RCMentionedInfo *mentionedInfo;
 
 /**
  设置焚烧时间
@@ -139,7 +141,7 @@
  消息的附加信息
  请确保传入的是 NSString 类型的数据
  */
-@property (nonatomic, copy) NSString *extra;
+@property (nonatomic, copy, nullable) NSString *extra;
 
 /**
  将用户信息编码到字典中
@@ -177,7 +179,10 @@
  @discussion 此字段存放消息内容中未编码的json数据。
  SDK内置的消息,如果消息解码失败,默认会将消息的内容存放到此字段;如果编码和解码正常,此字段会置为nil。
  */
-@property (nonatomic, strong, setter=setRawJSONData:) NSData *rawJSONData;
+@property (nonatomic, strong, nullable, setter=setRawJSONData:) NSData *rawJSONData;
 
 @end
+
+NS_ASSUME_NONNULL_END
+
 #endif

Некоторые файлы не были показаны из-за большого количества измененных файлов