Commit bef027e

committed

私信语音判断

1 parent 0616260 commit bef027eCopy full SHA for bef027e

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`253`	`253`	`PrivateMessage *curMsg = [_myPriMsgs.dataList objectAtIndex:curIndex];`
`254`	`254`	`if (curMsg.hasMedia) {`
`255`	`255`	`cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_MessageMedia forIndexPath:indexPath];`
`256`		`- }else if (curMsg.file \|\| curMsg.voiceMedia) {`
	`256`	`+ }else if ([curMsgisVoice]) {`
`257`	`257`	`cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_MessageVoice forIndexPath:indexPath];`
`258`	`258`	`}else{`
`259`	`259`	`cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_Message forIndexPath:indexPath];`
`@@ -296,7 +296,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`296`	`296`	`[menuItemArray addObject:@"拷贝文字"];`
`297`	`297`	`}`
`298`	`298`	`}else{`
`299`		`- if (!(curMsg.voiceMedia \|\| curMsg.file)) {`
	`299`	`+ if (!([curMsgisVoice])) {`
`300`	`300`	`[menuItemArray addObject:@"拷贝"];`
`301`	`301`	`}`
`302`	`302`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ typedef NS_ENUM(NSInteger, PrivateMessageSendStatus) {`
`19`	`19`	`@interface PrivateMessage : NSObject`
`20`	`20`	`@property (readwrite, nonatomic, strong) NSString content, extra, *file;`
`21`	`21`	`@property (readwrite, nonatomic, strong) User friend, sender;`
`22`		`-@property (readwrite, nonatomic, strong) NSNumber count, unreadCount, id, read_at, status, duration, *played;`
	`22`	`+@property (readwrite, nonatomic, strong) NSNumber count, unreadCount, id, read_at, status, duration, played, type;`
`23`	`23`	`@property (readwrite, nonatomic, strong) NSDate *created_at;`
`24`	`24`	`@property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;`
`25`	`25`	`@property (assign, nonatomic) PrivateMessageSendStatus sendStatus;`
`@@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, PrivateMessageSendStatus) {`
`28`	`28`
`29`	`29`	`- (BOOL)hasMedia;`
`30`	`30`	`- (BOOL)isSingleBigMonkey;`
	`31`	`+- (BOOL)isVoice;`
`31`	`32`
`32`	`33`	`+ (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend;`
`33`	`34`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@ - (BOOL)isSingleBigMonkey{`
`45`	`45`	`}`
`46`	`46`	`return isSingleBigMonkey;`
`47`	`47`	`}`
	`48`	`+- (BOOL)isVoice{`
	`49`	`+ return (_type.integerValue == 1 \|\| _voiceMedia);`
	`50`	`+}`
`48`	`51`	`+ (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend{`
`49`	`52`	`PrivateMessage *nextMsg = [[PrivateMessage alloc] init];`
`50`	`53`	`nextMsg.sender = [Login curLoginUser];`
`@@ -61,7 +64,6 @@ + (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend{`
`61`	`64`	`nextMsg.extra = @"";`
`62`	`65`	`}else if ([obj isKindOfClass:[VoiceMedia class]]){`
`63`	`66`	`nextMsg.voiceMedia = obj;`
`64`		`-// nextMsg.content = @"";`
`65`	`67`	`nextMsg.extra = @"";`
`66`	`68`	`}else if ([obj isKindOfClass:[PrivateMessage class]]){`
`67`	`69`	`PrivateMessage originalMsg = (PrivateMessage )obj;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ - (void)layoutSubviews{`
`67`	`67`	`if (_curPriMsg.hasMedia) {`
`68`	`68`	`[textMsg appendString:@"[图片]"];`
`69`	`69`	`}`
`70`		`- if (_curPriMsg.file \|\| _curPriMsg.voiceMedia) {`
	`70`	`+ if ([_curPriMsgisVoice]) {`
`71`	`71`	`[textMsg setString:@"[语音]"];`
`72`	`72`	`if (_curPriMsg.played.intValue == 0) {`
`73`	`73`	`_msg.textColor = kColorBrandGreen;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ - (void)setCurPriMsg:(PrivateMessage )curPriMsg andPrePriMsg:(PrivateMessage )`
`172`	`172`	`CGFloat contentWidth = [_curPriMsg isSingleBigMonkey]? [MessageMediaItemCCell monkeyCcellSize].width : kMessageCell_ContentWidth;`
`173`	`173`	`bgImgViewSize = CGSizeMake(contentWidth +2*kMessageCell_PadingWidth,`
`174`	`174`	`mediaViewHeight +textSize.height + kMessageCell_PadingHeight*(_curPriMsg.content.length > 0? 3:2));`
`175`		`- } else if (curPriMsg.file \|\| curPriMsg.voiceMedia) {`
	`175`	`+ } else if ([curPriMsgisVoice]) {`
`176`	`176`	`bgImgViewSize = CGSizeMake(kMessageCell_ContentWidth, 40);`
`177`	`177`	`} else{`
`178`	`178`	`[_contentLabel setY:kMessageCell_PadingHeight];`
`@@ -287,7 +287,7 @@ + (CGFloat)cellHeightWithObj:(id)obj preObj:(id)preObj{`
`287`	`287`	`CGSize textSize = [curPriMsg.content getSizeWithFont:kMessageCell_FontContent constrainedToSize:CGSizeMake(kMessageCell_ContentWidth, CGFLOAT_MAX)];`
`288`	`288`	`CGFloat mediaViewHeight = [MessageCell mediaViewHeightWithObj:curPriMsg];`
`289`	`289`	`cellHeight += mediaViewHeight;`
`290`		`- if (curPriMsg.voiceMedia \|\| curPriMsg.file) {`
	`290`	`+ if ([curPriMsgisVoice]) {`
`291`	`291`	`cellHeight += kMessageCell_PadingHeight*2+40;`
`292`	`292`	`} else {`
`293`	`293`	`cellHeight += textSize.height + kMessageCell_PadingHeight*4;`

Comments

(0)