Release SealTalk Demo version 5.7.2

ios-sealtalk/Podfile

@@ -3,13 +3,13 @@ platform :ios, '9.0'
 inhibit_all_warnings!
 
 def im
-  pod 'RongCloudIM/IMLibCore', '5.12.0'
-  pod 'RongCloudIM/IMLib', '5.12.0'
-  pod 'RongCloudIM/IMKit', '5.12.0'
-  pod 'RongCloudIM/RongSticker', '5.12.0'
-  pod 'RongCloudIM/Sight', '5.12.0'
-  pod 'RongCloudIM/ContactCard', '5.12.0'
-  pod 'RongCloudIM/LocationKit', '5.12.0'
+  pod 'RongCloudIM/IMLibCore', '5.7.2'
+  pod 'RongCloudIM/IMLib', '5.7.2'
+  pod 'RongCloudIM/IMKit', '5.7.2'
+  pod 'RongCloudIM/RongSticker', '5.7.2'
+  pod 'RongCloudIM/Sight', '5.7.2'
+  pod 'RongCloudIM/ContactCard', '5.7.2'
+  pod 'RongCloudIM/LocationKit', '5.7.2'
 end
 
 target 'SealTalk' do

ios-sealtalk/RCloudMessage/AppDelegate.m

@@ -917,12 +917,6 @@ - (void)disableCheckDupMessageIfNeed {
         [[RCCoreClient sharedCoreClient] setCheckDuplicateMessage:!enable];
     }
     NSLog(@"SealTalk setCheckDuplicateMessage %@", @(!enable));
-
-    enable = [[userDefault valueForKey:RCDDebugDisableCheckChatroomDupMessage] boolValue];
-    if (enable) {
-        [[RCChatRoomClient sharedChatRoomClient] setCheckChatRoomDuplicateMessage:!enable];
-    }
-    NSLog(@"SealTalk setCheckChatRoomDuplicateMessage %@", @(!enable));
 }
 
 - (void)enableMessageAttachUserInfoIfNeed {

ios-sealtalk/RCloudMessage/Sections/Chat/RCDChatViewController.m

@@ -69,7 +69,6 @@
 @interface RCConversationViewController ()
 // 小视频录制失败回调
 - (void)sightDidRecordFailedWith:(NSError *)error status:(NSInteger)status;
-- (void)didSendingMessageNotification:(NSNotification *)notification;
 @end
 
 @interface RCDChatViewController () <RCMessageCellDelegate, RCDQuicklySendManagerDelegate, UIGestureRecognizerDelegate, RealTimeLocationStatusViewDelegate, RCRealTimeLocationObserver, RCMessageBlockDelegate, RCChatRoomMemberDelegate>
@@ -696,13 +695,6 @@ - (BOOL)didTapCommonPhrasesButton {
     return [DEFAULTS boolForKey:RCDDebugBlockedCommonPhrasesButton];
 }
 
-- (void)noMoreMessageToFetch {
-    BOOL debugModeSearch = [[NSUserDefaults standardUserDefaults] boolForKey:RCDDebugEnableNoMoreMessageToFetchKey];
-    if (debugModeSearch) {
-        [self showToastMsg:@"没有更多历史消息"];
-    }
-}
-
 #pragma mark - target action
 /**
  *  此处使用自定义设置，开发者可以根据需求自己实现
@@ -1233,20 +1225,6 @@ - (void)combineV2forwardMessage {
     }
 }
 
-- (void)didSendingMessageNotification:(NSNotification *)notification {
-    [super didSendingMessageNotification:notification];
-    NSDictionary *statusDic = notification.userInfo;
-    NSNumber *error = statusDic[@"error"];
-    if (error) {
-        RCErrorCode errorCode = [error intValue];
-        if (errorCode == RC_FILE_SIZE_EXCEED_LIMIT) {
-            [self showToastMsg:RCDLocalizedString(@"media_file_size_limit")];
-        }  else if (errorCode == INVALID_PARAMETER_SIZE_NOT_FOUND) {
-            [self showToastMsg:@"开启限制未传 size 参数"];
-        }
-    }
-
-}
 - (void)onEndForwardMessage:(NSNotification *)notification {
     //置为 NO,将消息 cell 重置为初始状态
     self.allowsMessageCellSelection = NO;

ios-sealtalk/RCloudMessage/Sections/Debug/CommonChatroom/RCDDebugComChatViewController.m

@@ -217,8 +217,6 @@ - (RCMessagePushConfig *)getPushConfig {
     pushConfig.androidConfig.hwImageUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-android-hwImageUrl"];
     pushConfig.androidConfig.miLargeIconUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-android-miLargeIconUrl"];
     pushConfig.androidConfig.fcmChannelId = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-android-fcmChannelId"];
-    pushConfig.hmosConfig.category = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-HarmonyOS-category"];
-    pushConfig.hmosConfig.imageUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-HarmonyOS-imageUrl"];
     return pushConfig;
 }
 

ios-sealtalk/RCloudMessage/Sections/Debug/MessagePushConfig/RCDDebugChatViewController.m

@@ -212,11 +212,6 @@ - (RCMessagePushConfig *)getPushConfig {
     // honor
     pushConfig.androidConfig.importanceHonor = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-android-importanceHonor"];
     pushConfig.androidConfig.imageUrlHonor = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-android-imageUrlHonor"];
-
-    // HMOS
-    pushConfig.hmosConfig.imageUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-HarmonyOS-imageUrl"];
-
-    pushConfig.hmosConfig.category = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-HarmonyOS-category"];
     return pushConfig;
 }
 

ios-sealtalk/RCloudMessage/Sections/Debug/MessagePushConfig/RCDDebugMessagePushConfigController.m

@@ -77,12 +77,6 @@ @interface RCDDebugMessagePushConfigController ()
 
 @property (nonatomic, strong) UITextField *imageUrlHonorTF;
 
-// HMOS
-@property (nonatomic, strong) UITextField *imageUrlHMOSTF;
-
-@property (nonatomic, strong) UITextField *categoryHMOSTF;
-
-
 @property (nonatomic, strong) RCMessagePushConfig *pushConfig;
 
 @property (nonatomic, strong) RCMessageConfig *config;
@@ -137,9 +131,6 @@ - (void)setupUI {
     [self.contentView addSubview:self.importanceHonorTF];
     [self.contentView addSubview:self.imageUrlHonorTF];
 
-    [self.contentView addSubview:self.imageUrlHMOSTF];
-    [self.contentView addSubview:self.categoryHMOSTF];
-
     [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.bottom.equalTo(self.view);
     }];
@@ -287,18 +278,6 @@ - (void)setupUI {
     [self.imageUrlHonorTF mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.importanceHonorTF.mas_bottom).offset(10);
         make.height.left.right.equalTo(self.disableTitleBtn);
-//        make.bottom.equalTo(self.contentView);
-    }];
-
-    [self.imageUrlHMOSTF mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.imageUrlHonorTF.mas_bottom).offset(10);
-        make.height.left.right.equalTo(self.disableTitleBtn);
-//        make.bottom.equalTo(self.contentView);
-    }];
-
-    [self.categoryHMOSTF mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.imageUrlHMOSTF.mas_bottom).offset(10);
-        make.height.left.right.equalTo(self.disableTitleBtn);
         make.bottom.equalTo(self.contentView);
     }];
 }
@@ -433,9 +412,6 @@ - (void)save {
     pushConfig.androidConfig.importanceHonor = self.importanceHonorTF.text;
     pushConfig.androidConfig.imageUrlHonor = self.imageUrlHonorTF.text;
 
-    // HMOS
-    pushConfig.hmosConfig.imageUrl = self.imageUrlHMOSTF.text;
-    pushConfig.hmosConfig.category = self.categoryHMOSTF.text;
     [self saveToUserDefaults:pushConfig];
 
     RCMessageConfig *config = [[RCMessageConfig alloc] init];
@@ -478,10 +454,6 @@ - (void)saveToUserDefaults:(RCMessagePushConfig *)pushConfig {
     // honor
     [[NSUserDefaults standardUserDefaults] setObject:pushConfig.androidConfig.importanceHonor forKey:@"pushConfig-android-importanceHonor"];
     [[NSUserDefaults standardUserDefaults] setObject:pushConfig.androidConfig.imageUrlHonor forKey:@"pushConfig-android-imageUrlHonor"];
-
-    // HMOS
-    [[NSUserDefaults standardUserDefaults] setObject:pushConfig.hmosConfig.category forKey:@"pushConfig-HarmonyOS-category"];
-    [[NSUserDefaults standardUserDefaults] setObject:pushConfig.hmosConfig.imageUrl forKey:@"pushConfig-HarmonyOS-imageUrl"];
 }
 
 - (void)saveConfigToUserDefaults:(RCMessageConfig *)config {
@@ -527,10 +499,6 @@ - (void)getDefaultPushConfig {
         self.pushConfig.androidConfig.importanceHonor = RCImportanceHonorNormal;
     }
     self.pushConfig.androidConfig.imageUrlHonor = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-android-imageUrlHonor"];
-// HMOS
-    self.pushConfig.hmosConfig.imageUrl = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-HarmonyOS-imageUrl"];
-
-    self.pushConfig.hmosConfig.category = [[NSUserDefaults standardUserDefaults] objectForKey:@"pushConfig-HarmonyOS-category"];
 
     self.config = [[RCMessageConfig alloc] init];
     self.config.disableNotification = [[[NSUserDefaults standardUserDefaults] objectForKey:@"config-disableNotification"] boolValue];
@@ -838,22 +806,5 @@ - (UITextField *)imageUrlHonorTF {
     return _imageUrlHonorTF;
 }
 
-- (UITextField *)imageUrlHMOSTF {
-    if (!_imageUrlHMOSTF) {
-        _imageUrlHMOSTF = [[UITextField alloc] init];
-        _imageUrlHMOSTF.placeholder = @"HarmonyOS 图片地址";
-        _imageUrlHMOSTF.layer.borderWidth = 1;
-    }
-    return _imageUrlHMOSTF;
-}
-
-- (UITextField *)categoryHMOSTF {
-    if (!_categoryHMOSTF) {
-        _categoryHMOSTF = [[UITextField alloc] init];
-        _categoryHMOSTF.placeholder = @"HarmonyOS 类别";
-        _categoryHMOSTF.layer.borderWidth = 1;
-    }
-    return _categoryHMOSTF;
-}
 
 @end

ios-sealtalk/RCloudMessage/Sections/Debug/RCDDebugTableViewController.m

@@ -65,16 +65,10 @@
 #define ENABLE_NORMAL_VOICE_TAG 124
 #define ENABLE_COMBINE_V2_TAG 125
 #define ENABLE_MESSAGE_ATTACH_USERINFO_TAG 126
-#define ENABLE_SEARCH_MESSAGETYPES 127
-#define ENABLE_DISPLAY_NOMORE_MESSAGE_HUD 128
-#define DISABLE_CHECK_CHATROOM_DUP_MESSAGE 129
-
 #define FILEMANAGER [NSFileManager defaultManager]
 
-#define Title_Display_Search_MessageTypes @"消息类型搜索"
 NSString *const RCDDebugCombineV2EnableString = @"合并转发V2";
 NSString *const RCDDebugMessageAttachUserInfoEnableString = @"发消息携带userinfo";
-#define Title_Display_NoMore_Message_HUD @"消息无更多 Toast"
 
 @interface RCCoreClient()
 - (void)refetchNavidataSuccess:(void (^)(void))success
@@ -202,9 +196,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     if ([title isEqualToString:@"关闭消息排重并杀死APP"]) {
         [self setSwitchButtonCell:cell tag:DISABLE_CHECK_DUP_MESSAGE];
     }
-    if ([title isEqualToString:@"关闭聊天室消息排重"]) {
-        [self setSwitchButtonCell:cell tag:DISABLE_CHECK_CHATROOM_DUP_MESSAGE];
-    }
     if ([title isEqualToString:@"开启群组实时位置共享"]) {
         [self setSwitchButtonCell:cell tag:ENABLE_GROUP_REAL_TIME_LOCATION];
     }
@@ -235,19 +226,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     if ([title isEqualToString:RCDDebugMessageAttachUserInfoEnableString]) {
         [self setSwitchButtonCell:cell tag:ENABLE_MESSAGE_ATTACH_USERINFO_TAG];
     }
-    if ([title isEqualToString:Title_Display_Search_MessageTypes]) {
-        [self setSwitchButtonCell:cell tag:ENABLE_SEARCH_MESSAGETYPES];
-    }
     if ([title isEqualToString:RCDLocalizedString(@"Set_offline_message_compensation_time")] ||
         [title isEqualToString:RCDLocalizedString(@"Set_global_DND_time")]) {
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     }
     if([title isEqualToString:@"友盟设备识别信息"]){
     }
-    if ([title isEqualToString:Title_Display_NoMore_Message_HUD]) {
-        [self setSwitchButtonCell:cell tag:ENABLE_DISPLAY_NOMORE_MESSAGE_HUD];
-    }
-
     return cell;
 }
 
@@ -363,7 +347,6 @@ - (void)initdata {
         @"自定义表情",
         @"隐藏表情按钮",
         @"关闭消息排重并杀死APP",
-        @"关闭聊天室消息排重",
         @"开启群组实时位置共享",
         @"开启合并转发拦截",
         @"自定义文件图标",
@@ -374,9 +357,7 @@ - (void)initdata {
         @"暂停下载功能测试",
         @"是否禁用崩溃收集",
         RCDDebugCombineV2EnableString,
-        RCDDebugMessageAttachUserInfoEnableString,
-        Title_Display_Search_MessageTypes,
-        Title_Display_NoMore_Message_HUD
+        RCDDebugMessageAttachUserInfoEnableString
     ]
             forKey:RCDLocalizedString(@"custom_setting")];
     [dic setObject:@[ @"进入聊天室存储测试", RCDLocalizedString(@"Set_chatroom_default_history_message"), @"聊天室绑定RTCRoom" ]
@@ -491,10 +472,7 @@ - (void)addSwitchToCell:(UITableViewCell *)cell {
         case ENABLE_CONVERSATION_DISPLAY_NAME: {
             isButtonOn = [DEFAULTS boolForKey:RCDDebugDisplayUserName];
             break;
-        }
-        case ENABLE_SEARCH_MESSAGETYPES: {
-            isButtonOn = [DEFAULTS boolForKey:RCDDebugEnableSearchByMessageTypes];
-            break;
+
         }
         case BLOCKED_COMMON_PHRASES_BUTTON_ACTION: {
             isButtonOn = [DEFAULTS boolForKey:RCDDebugBlockedCommonPhrasesButton];
@@ -528,14 +506,6 @@ - (void)addSwitchToCell:(UITableViewCell *)cell {
             isButtonOn = [DEFAULTS boolForKey:RCDDebugEnableMessageAttachUserInfoKey];
             break;
         }
-        case ENABLE_DISPLAY_NOMORE_MESSAGE_HUD: {
-            isButtonOn = [DEFAULTS boolForKey:RCDDebugEnableNoMoreMessageToFetchKey];
-            break;
-        }
-        case DISABLE_CHECK_CHATROOM_DUP_MESSAGE: {
-            isButtonOn = [DEFAULTS boolForKey:RCDDebugDisableCheckChatroomDupMessage];
-            break;
-        }
         default:
             break;
 
@@ -564,35 +534,35 @@ - (void)switchAction:(id)sender {
     UISwitch *switchButton = (UISwitch *)sender;
     BOOL isButtonOn = [switchButton isOn];
     switch (switchButton.tag) {
-        case DISPLAY_ID_TAG: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDisplayIDKey];
-            [DEFAULTS synchronize];
-        } break;
+    case DISPLAY_ID_TAG: {
+        [DEFAULTS setBool:isButtonOn forKey:RCDDisplayIDKey];
+        [DEFAULTS synchronize];
+    } break;
 
-        case DISPLAY_ONLINE_STATUS_TAG: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDisplayOnlineStatusKey];
-            [DEFAULTS synchronize];
-        } break;
-            
-        case JOIN_CHATROOM_TAG: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDStayAfterJoinChatRoomFailedKey];
-            [DEFAULTS synchronize];
-        } break;
-        case DATA_STATISTICS_TAG: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDebugDataStatisticsKey];
-            [DEFAULTS synchronize];
-            [[RCDDataStatistics sharedInstance] notify];
-        } break;
-        case BURN_MESSAGE_TAG: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDebugBurnMessageKey];
-            [DEFAULTS synchronize];
-            RCKitConfigCenter.message.enableDestructMessage = isButtonOn;
-        } break;
-        case SEND_COMBINE_MESSAGE_TAG: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDebugSendCombineMessageKey];
-            [DEFAULTS synchronize];
-            [RCIM sharedRCIM].enableSendCombineMessage = isButtonOn;
-        } break;
+    case DISPLAY_ONLINE_STATUS_TAG: {
+        [DEFAULTS setBool:isButtonOn forKey:RCDDisplayOnlineStatusKey];
+        [DEFAULTS synchronize];
+    } break;
+
+    case JOIN_CHATROOM_TAG: {
+        [DEFAULTS setBool:isButtonOn forKey:RCDStayAfterJoinChatRoomFailedKey];
+        [DEFAULTS synchronize];
+    } break;
+    case DATA_STATISTICS_TAG: {
+        [DEFAULTS setBool:isButtonOn forKey:RCDDebugDataStatisticsKey];
+        [DEFAULTS synchronize];
+        [[RCDDataStatistics sharedInstance] notify];
+    } break;
+    case BURN_MESSAGE_TAG: {
+        [DEFAULTS setBool:isButtonOn forKey:RCDDebugBurnMessageKey];
+        [DEFAULTS synchronize];
+        RCKitConfigCenter.message.enableDestructMessage = isButtonOn;
+    } break;
+    case SEND_COMBINE_MESSAGE_TAG: {
+        [DEFAULTS setBool:isButtonOn forKey:RCDDebugSendCombineMessageKey];
+        [DEFAULTS synchronize];
+        [RCIM sharedRCIM].enableSendCombineMessage = isButtonOn;
+    } break;
         case DISABLE_SYSTEM_EMOJI_TAG:{
             [DEFAULTS setBool:isButtonOn forKey:RCDDebugDisableSystemEmoji];
             [DEFAULTS synchronize];
@@ -643,11 +613,6 @@ - (void)switchAction:(id)sender {
             [DEFAULTS synchronize];
             break;
         }
-        case DISABLE_CHECK_CHATROOM_DUP_MESSAGE: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDebugDisableCheckChatroomDupMessage];
-            [DEFAULTS synchronize];
-            break;
-        }
         case ENABLE_GROUP_REAL_TIME_LOCATION: {
             [DEFAULTS setBool:isButtonOn forKey:RCDDebugEnableRealTimeLocation];
             [DEFAULTS synchronize];
@@ -706,17 +671,6 @@ - (void)switchAction:(id)sender {
             exit(0);
             break;
         }
-        case ENABLE_SEARCH_MESSAGETYPES: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDebugEnableSearchByMessageTypes];
-            [DEFAULTS synchronize];
-            break;
-        }
-        case ENABLE_DISPLAY_NOMORE_MESSAGE_HUD: {
-            [DEFAULTS setBool:isButtonOn forKey:RCDDebugEnableNoMoreMessageToFetchKey];
-            [DEFAULTS synchronize];
-            break;
-        }
-
         default:
             break;
     }