Commit 7c01474f37b1ceba4f990d35906060b9f27743f8

Authored by daojian
1 parent 43736ab1

报修订单自动高度计算

CNLiveNewIMAManagerKit.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveNewIMAManagerKit' 10 s.name = 'CNLiveNewIMAManagerKit'
11 - s.version = '0.4.3' 11 + s.version = '0.4.5'
12 s.summary = 'A short description of CNLiveNewIMAManagerKit.' 12 s.summary = 'A short description of CNLiveNewIMAManagerKit.'
13 13
14 #s.description = <<-DESC 14 #s.description = <<-DESC
CNLiveNewIMAManagerKit/Classes/Playform/IMAConversationManager.m
@@ -1173,7 +1173,9 @@ @@ -1173,7 +1173,9 @@
1173 [[IMAPlatform sharedInstance].contactMgr deleteLocalGroupInfo:gse.group]; 1173 [[IMAPlatform sharedInstance].contactMgr deleteLocalGroupInfo:gse.group];
1174 //群被解散 1174 //群被解散
1175 [[CNGroupListAvaterUtil sharedCNGroupListAvaterUtil] requestTIMGroupInfoForChangeType:CNLiveGroupMemberChangeTypeExitGroup GroupID:gse.group]; 1175 [[CNGroupListAvaterUtil sharedCNGroupListAvaterUtil] requestTIMGroupInfoForChangeType:CNLiveGroupMemberChangeTypeExitGroup GroupID:gse.group];
1176 - [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_QuitedGroupNotification object:nil]; 1176 +
  1177 + //type 1:被删除 2:群解散
  1178 + [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_QuitedGroupNotification object:gse.group userInfo:@{@"groupId" : gse.group, @"type" : @"2"}];
1177 } 1179 }
1178 else if (gse.type == TIM_GROUP_SYSTEM_KICK_OFF_FROM_GROUP_TYPE) 1180 else if (gse.type == TIM_GROUP_SYSTEM_KICK_OFF_FROM_GROUP_TYPE)
1179 { 1181 {
@@ -1185,7 +1187,9 @@ @@ -1185,7 +1187,9 @@
1185 [[IMAPlatform sharedInstance].contactMgr removeUser:group]; 1187 [[IMAPlatform sharedInstance].contactMgr removeUser:group];
1186 //更新本地群组头像 1188 //更新本地群组头像
1187 [[CNGroupListAvaterUtil sharedCNGroupListAvaterUtil] requestTIMGroupInfoForChangeType:CNLiveGroupMemberChangeTypeExitGroup GroupID:gse.group]; 1189 [[CNGroupListAvaterUtil sharedCNGroupListAvaterUtil] requestTIMGroupInfoForChangeType:CNLiveGroupMemberChangeTypeExitGroup GroupID:gse.group];
1188 - [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_QuitedGroupNotification object:gse.group]; 1190 +
  1191 + //type 1:被删除 2:群解散
  1192 + [[NSNotificationCenter defaultCenter] postNotificationName:kIMAMSG_QuitedGroupNotification object:gse.group userInfo:@{@"groupId" : gse.group, @"type" : @"1"}];
1189 } 1193 }
1190 else if (gse.type == TIM_GROUP_SYSTEM_QUIT_GROUP_TYPE) 1194 else if (gse.type == TIM_GROUP_SYSTEM_QUIT_GROUP_TYPE)
1191 { 1195 {
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
@@ -844,7 +844,11 @@ @@ -844,7 +844,11 @@
844 break; 844 break;
845 case EIMAMSG_CommuntyOrder: 845 case EIMAMSG_CommuntyOrder:
846 { 846 {
847 - return CGSizeMake(width, (260+10)*RATIO); 847 + NSDictionary * repairOrderDict = [packMsg.customMsgData objectForKey:@"repairOrder"];
  848 + NSString *addrss = [NSString stringWithFormat:@"%@",[repairOrderDict stringValueForKey:@"address" default:@""]];
  849 +
  850 + CGFloat addrssH = [addrss boundingRectWithSize:CGSizeMake(kScreenWidth*0.6 - 50, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14]} context:nil].size.height;
  851 + return CGSizeMake(width, (180 + addrssH +10)*RATIO);
848 } 852 }
849 break; 853 break;
850 case EIMAMSG_PhotoAlbumDynamic: 854 case EIMAMSG_PhotoAlbumDynamic:
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
@@ -1174,6 +1174,11 @@ @@ -1174,6 +1174,11 @@
1174 1174
1175 } 1175 }
1176 1176
  1177 + if (self.type == EIMAMSG_FamilyGift) {
  1178 + nameAtt = [[NSMutableAttributedString alloc] initWithString:@"" attributes:@{NSFontAttributeName : UIFontCNMake(14), NSForegroundColorAttributeName : KGray101Color}];
  1179 +
  1180 + }
  1181 +
1177 } 1182 }
1178 } 1183 }
1179 } 1184 }