Merge branch 'main' of https://github.com/easemob/easeui_ios into main

easemob · Jan 30, 2024 · 6c25047 · 6c25047
2 parents b64f430 + 1383dc5
commit 6c25047
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/EaseIMKit/EaseIMKit/Classes/Conversations/Controllers/EaseConversationsViewController.m b/EaseIMKit/EaseIMKit/Classes/Conversations/Controllers/EaseConversationsViewController.m
@@ -159,11 +159,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     }
 
     EaseConversationCell *cell = [EaseConversationCell tableView:tableView cellViewModel:_viewModel];
-    if (self.dataAry.count > indexPath.row) {
-        EaseConversationModel *model = self.dataAry[indexPath.row];
-
-        cell.model = model;
+    if (indexPath.row >= self.dataAry.count || self.dataAry.count <= 0) {
+        return cell;
     }
+    EaseConversationModel *model = self.dataAry[indexPath.row];
+
+    cell.model = model;
 
     return cell;
 }
@@ -319,11 +320,12 @@ - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (indexPath.row >= self.dataAry.count || self.dataAry.count <= 0) {
+        return;
+    }
     EaseConversationModel *model = [self.dataAry objectAtIndex:indexPath.row];
     if (!model.isTop) {
         [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    } else {
-
     }
     [self removeAt:model];
     if (self.delegate && [self.delegate respondsToSelector:@selector(easeTableView:didSelectRowAtIndexPath:)]) {