切换用户时需要清理用户相关的组织缓存

0x1306a94 · Jan 2, 2023 · ac62324 · ac62324
1 parent 77c19c2
commit ac62324
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/wfchat/WildFireChat/AppDelegate.m b/wfchat/WildFireChat/AppDelegate.m
@@ -612,6 +612,8 @@ - (void)onConnectionStatusChanged:(ConnectionStatus)status {
  [[AppService sharedAppService] clearAppServiceAuthInfos];
  [[OrgService sharedOrgService] clearOrgServiceAuthInfos];
  [[NSUserDefaults standardUserDefaults] synchronize];
+
+ self.firstConnected = NO;
  } else if(status == kConnectionStatusConnected) {
  if(!self.firstConnected) {
  self.firstConnected = YES;

diff --git a/wfchat/WildFireChat/OrgService/OrgService.m b/wfchat/WildFireChat/OrgService/OrgService.m
@@ -330,6 +330,9 @@ - (NSString *)getOrgServiceAuthToken {
 
 - (void)clearOrgServiceAuthInfos {
  [[NSUserDefaults standardUserDefaults] removeObjectForKey:WFC_ORGSERVER_AUTH_TOKEN];
+
+ //remove kit org cache
+ [[WFCUOrganizationCache sharedCache] clearCaches];
 }
 
 @end
diff --git a/wfuikit/WFChatUIKit/Contacts/ViewController/WFCUContactListViewController.m b/wfuikit/WFChatUIKit/Contacts/ViewController/WFCUContactListViewController.m
@@ -731,12 +731,17 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
  NSMutableArray *ids = [[NSMutableArray alloc] init];
  while (index) {
  [ids insertObject:@(index) atIndex:0];
+ __block BOOL has = NO;
  [rs enumerateObjectsUsingBlock:^(WFCUOrgRelationship * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
  if(obj.organizationId == index) {
  index = obj.parentOrganizationId;
  *stop = YES;
+ has = YES;
  }
  }];
+ if(!has) {
+ break;
+ }
  }
  WFCUOrganizationViewController *orgVC = [[WFCUOrganizationViewController alloc] init];
  orgVC.organizationIds = ids;

diff --git a/wfuikit/WFChatUIKit/Contacts/ViewController/WFCUOrganizationViewController.m b/wfuikit/WFChatUIKit/Contacts/ViewController/WFCUOrganizationViewController.m
@@ -146,7 +146,7 @@ - (void)viewDidLoad {
  layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
  layout.minimumLineSpacing = 0;
  layout.minimumInteritemSpacing = 0;
- layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+ layout.sectionInset = UIEdgeInsetsMake(0, 10, 0, 10);
  self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, 32) collectionViewLayout:layout];
  self.collectionView.dataSource = self;
  self.collectionView.delegate = self;

diff --git a/wfuikit/WFChatUIKit/Organization/WFCUOrganizationCache.h b/wfuikit/WFChatUIKit/Organization/WFCUOrganizationCache.h
@@ -38,6 +38,7 @@ extern NSString *kOrgRelationUpdated;
 @property(nonatomic, strong)NSArray<NSNumber *> *bottomOrganizationIds;
 
 - (void)loadMyOrganizationInfos;
+- (void)clearCaches;
 
 - (void)getRelationship:(NSString *)employeeId
  refresh:(BOOL)refresh

diff --git a/wfuikit/WFChatUIKit/Organization/WFCUOrganizationCache.m b/wfuikit/WFChatUIKit/Organization/WFCUOrganizationCache.m
@@ -44,6 +44,7 @@ + (WFCUOrganizationCache *)sharedCache {
  sharedSingleton.organizationDict = [[NSMutableDictionary alloc] init];
  sharedSingleton.organizationExDict = [[NSMutableDictionary alloc] init];
  sharedSingleton.relationshipDict = [[NSMutableDictionary alloc] init];
+ [sharedSingleton restoreMyOrganizationInfos];
  }
  }
  }
@@ -78,9 +79,14 @@ - (void)restoreMyOrganizationInfos {
  }];
 }
 
-- (void)loadMyOrganizationInfos {
- [self restoreMyOrganizationInfos];
+- (void)clearCaches {
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"WFC_bottomOrganizationIds"];
+ [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"WFC_rootOrganizationIds"];
+ self.bottomOrganizationIds = nil;
+ self.rootOrganizationIds = nil;
+}
 
+- (void)loadMyOrganizationInfos {
  [[WFCUConfigManager globalManager].orgServiceProvider getRelationship:[WFCCNetworkService sharedInstance].userId success:^(NSArray<WFCUOrgRelationship *> * _Nonnull relationships) {
  self.relationshipDict[[WFCCNetworkService sharedInstance].userId] = relationships;
  NSMutableArray<NSNumber *> *bottomIds = [[NSMutableArray alloc] init];