0.1.9 版本 @ 逻辑修改

daojian
1 parent 7ee5a46a
Showing 2 changed files with 22 additions and 7 deletions
CNLiveNewIMAManagerKit.podspec
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveNewIMAManagerKit'
-  s.version          = '0.1.8'
+  s.version          = '0.1.9'
   s.summary          = 'A short description of CNLiveNewIMAManagerKit.'
 # This description is used to generate tags and improve search results.
@@ -1023,10 +1023,17 @@
     NSMutableAttributedString *aiteAttStr = [[NSMutableAttributedString alloc] initWithString:@"" attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
     if (type == TIM_GROUP) {
-        NSString *groupId = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
-        NSString *currentGroupId = [[[IMAConversation alloc] initWith:conv] receiver];
+        NSString *currentGroupId = [conv getReceiver];
-        if ([groupId isEqualToString:currentGroupId])
+        /**关于旧版本@标识和新版本@标识区别，旧逻辑本地只存了一个最新有人@我的群ID，不支持同时有多个群@我。 新版本会对每个群进行@标识存储*/
+
+        /**旧版本 获取有人@我的群ID, 这个是为了兼容老版本*/
+        NSString *oldgGroupId = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+        
+        /**新版本，获取有人@我的群ID*/
+        NSString *groupId = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
+        
+        if ([groupId isEqualToString:currentGroupId] || [oldgGroupId isEqualToString:currentGroupId])
         {
             if ([self isWithdrawMsg]) {
@@ -1054,7 +1061,10 @@
                         if ([[groupAitDic objectForKey:@"isAitAll"] integerValue] == 1) {
                             //@所有人
                             if (![_msg isReaded]) {
-                                [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+//                                [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+//                                [[NSUserDefaults standardUserDefaults] synchronize];
+                                
+                                [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
                                 [[NSUserDefaults standardUserDefaults] synchronize];
                             }
@@ -1072,7 +1082,10 @@
                         if ([[dic objectForKey:@"isAitAll"] integerValue] == 1) {
                             //@所有人
                             if (![_msg isReaded]) {
-                                [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+//                                [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+//                                [[NSUserDefaults standardUserDefaults] synchronize];
+                                
+                                [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
                                 [[NSUserDefaults standardUserDefaults] synchronize];
                             }
@@ -1089,7 +1102,9 @@
                     if ([idArray containsObject:CNUserShareModel.uid]) {
                         if (![_msg isReaded]) {
-                            [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+//                            [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
+//                            [[NSUserDefaults standardUserDefaults] synchronize];
+                            [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
                             [[NSUserDefaults standardUserDefaults] synchronize];
                         }