iOS Team / CNLiveNewIMAManagerKit · Commits

Commit 65ad086260781022f30ccfaf9c111a6a75492b53

Authored by daojian
1 parent 7ee5a46a

0.1.9 版本 @ 逻辑修改

Inline Side-by-side
Showing 2 changed files with 22 additions and 7 deletions
CNLiveNewIMAManagerKit.podspec
  View file @65ad086
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveNewIMAManagerKit'
11   - s.version = '0.1.8'
  11 + s.version = '0.1.9'
12 12 s.summary = 'A short description of CNLiveNewIMAManagerKit.'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
  View file @65ad086
... ... @@ -1023,10 +1023,17 @@
1023 1023 NSMutableAttributedString *aiteAttStr = [[NSMutableAttributedString alloc] initWithString:@"" attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
1024 1024 if (type == TIM_GROUP) {
1025 1025  
1026   - NSString *groupId = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
1027   - NSString *currentGroupId = [[[IMAConversation alloc] initWith:conv] receiver];
  1026 + NSString *currentGroupId = [conv getReceiver];
1028 1027  
1029   - if ([groupId isEqualToString:currentGroupId])
  1028 + /**关于旧版本@标识和新版本@标识区别，旧逻辑本地只存了一个最新有人@我的群ID，不支持同时有多个群@我。 新版本会对每个群进行@标识存储*/
  1029 +
  1030 + /**旧版本 获取有人@我的群ID, 这个是为了兼容老版本*/
  1031 + NSString *oldgGroupId = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1032 +
  1033 + /**新版本，获取有人@我的群ID*/
  1034 + NSString *groupId = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
  1035 +
  1036 + if ([groupId isEqualToString:currentGroupId] || [oldgGroupId isEqualToString:currentGroupId])
1030 1037 {
1031 1038  
1032 1039 if ([self isWithdrawMsg]) {
... ... @@ -1054,7 +1061,10 @@
1054 1061 if ([[groupAitDic objectForKey:@"isAitAll"] integerValue] == 1) {
1055 1062 //@所有人
1056 1063 if (![_msg isReaded]) {
1057   - [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1064 +// [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1065 +// [[NSUserDefaults standardUserDefaults] synchronize];
  1066 +
  1067 + [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
1058 1068 [[NSUserDefaults standardUserDefaults] synchronize];
1059 1069 }
1060 1070  
... ... @@ -1072,7 +1082,10 @@
1072 1082 if ([[dic objectForKey:@"isAitAll"] integerValue] == 1) {
1073 1083 //@所有人
1074 1084 if (![_msg isReaded]) {
1075   - [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1085 +// [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1086 +// [[NSUserDefaults standardUserDefaults] synchronize];
  1087 +
  1088 + [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
1076 1089 [[NSUserDefaults standardUserDefaults] synchronize];
1077 1090 }
1078 1091  
... ... @@ -1089,7 +1102,9 @@
1089 1102 if ([idArray containsObject:CNUserShareModel.uid]) {
1090 1103  
1091 1104 if (![_msg isReaded]) {
1092   - [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1105 +// [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@",CNUserShareModel.uid]];
  1106 +// [[NSUserDefaults standardUserDefaults] synchronize];
  1107 + [[NSUserDefaults standardUserDefaults] setObject:currentGroupId forKey:[NSString stringWithFormat:@"IMAiteRemind_%@_%@",CNUserShareModel.uid,currentGroupId]];
1093 1108 [[NSUserDefaults standardUserDefaults] synchronize];
1094 1109 }
1095 1110  
... ...