私信语音判断

wanghengheng · wanghengheng · commit bef027ee03b7 · 2016-09-29T16:02:57.000+08:00
diff --git a/Coding_iOS/Controllers/ConversationViewController.m b/Coding_iOS/Controllers/ConversationViewController.m
@@ -253,7 +253,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     PrivateMessage *curMsg = [_myPriMsgs.dataList objectAtIndex:curIndex];
     if (curMsg.hasMedia) {
         cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_MessageMedia forIndexPath:indexPath];
-    }else if (curMsg.file || curMsg.voiceMedia) {
+    }else if ([curMsg isVoice]) {
         cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_MessageVoice forIndexPath:indexPath];
     }else{
         cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_Message forIndexPath:indexPath];
@@ -296,7 +296,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             [menuItemArray addObject:@"&#25335;&#36125;&#25991;&#23383;"];
         }
     }else{
-        if (!(curMsg.voiceMedia || curMsg.file)) {
+        if (!([curMsg isVoice])) {
             [menuItemArray addObject:@"&#25335;&#36125;"];
         }
     }
diff --git a/Coding_iOS/Models/PrivateMessage.h b/Coding_iOS/Models/PrivateMessage.h
@@ -19,7 +19,7 @@ typedef NS_ENUM(NSInteger, PrivateMessageSendStatus) {
 @interface PrivateMessage : NSObject
 @property (readwrite, nonatomic, strong) NSString *content, *extra, *file;
 @property (readwrite, nonatomic, strong) User *friend, *sender;
-@property (readwrite, nonatomic, strong) NSNumber *count, *unreadCount, *id, *read_at, *status, *duration, *played;
+@property (readwrite, nonatomic, strong) NSNumber *count, *unreadCount, *id, *read_at, *status, *duration, *played, *type;
 @property (readwrite, nonatomic, strong) NSDate *created_at;
 @property (readwrite, nonatomic, strong) HtmlMedia *htmlMedia;
 @property (assign, nonatomic) PrivateMessageSendStatus sendStatus;
@@ -28,6 +28,7 @@ typedef NS_ENUM(NSInteger, PrivateMessageSendStatus) {
 
 - (BOOL)hasMedia;
 - (BOOL)isSingleBigMonkey;
+- (BOOL)isVoice;
 
 + (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend;
 
diff --git a/Coding_iOS/Models/PrivateMessage.m b/Coding_iOS/Models/PrivateMessage.m
@@ -45,6 +45,9 @@ - (BOOL)isSingleBigMonkey{
     }
     return isSingleBigMonkey;
 }
+- (BOOL)isVoice{
+    return (_type.integerValue == 1 || _voiceMedia);
+}
 + (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend{
     PrivateMessage *nextMsg = [[PrivateMessage alloc] init];
     nextMsg.sender = [Login curLoginUser];
@@ -61,7 +64,6 @@ + (instancetype)privateMessageWithObj:(id)obj andFriend:(User *)curFriend{
         nextMsg.extra = @"";
     }else if ([obj isKindOfClass:[VoiceMedia class]]){
         nextMsg.voiceMedia = obj;
-//        nextMsg.content = @"";
         nextMsg.extra = @"";
     }else if ([obj isKindOfClass:[PrivateMessage class]]){
         PrivateMessage *originalMsg = (PrivateMessage *)obj;
diff --git a/Coding_iOS/Views/Cell/ConversationCell.m b/Coding_iOS/Views/Cell/ConversationCell.m
@@ -67,7 +67,7 @@ - (void)layoutSubviews{
     if (_curPriMsg.hasMedia) {
         [textMsg appendString:@"[&#22270;&#29255;]"];
     }
-    if (_curPriMsg.file || _curPriMsg.voiceMedia) {
+    if ([_curPriMsg isVoice]) {
         [textMsg setString:@"[&#35821;&#38899;]"];
         if (_curPriMsg.played.intValue == 0) {
             _msg.textColor = kColorBrandGreen;
diff --git a/Coding_iOS/Views/Cell/MessageCell.m b/Coding_iOS/Views/Cell/MessageCell.m
@@ -172,7 +172,7 @@ - (void)setCurPriMsg:(PrivateMessage *)curPriMsg andPrePriMsg:(PrivateMessage *)
         CGFloat contentWidth = [_curPriMsg isSingleBigMonkey]? [MessageMediaItemCCell monkeyCcellSize].width : kMessageCell_ContentWidth;
         bgImgViewSize = CGSizeMake(contentWidth +2*kMessageCell_PadingWidth,
                                    mediaViewHeight +textSize.height + kMessageCell_PadingHeight*(_curPriMsg.content.length > 0? 3:2));
-    } else if (curPriMsg.file || curPriMsg.voiceMedia) {
+    } else if ([curPriMsg isVoice]) {
         bgImgViewSize = CGSizeMake(kMessageCell_ContentWidth, 40);
     } else{
         [_contentLabel setY:kMessageCell_PadingHeight];
@@ -287,7 +287,7 @@ + (CGFloat)cellHeightWithObj:(id)obj preObj:(id)preObj{
         CGSize textSize = [curPriMsg.content getSizeWithFont:kMessageCell_FontContent constrainedToSize:CGSizeMake(kMessageCell_ContentWidth, CGFLOAT_MAX)];
         CGFloat mediaViewHeight = [MessageCell mediaViewHeightWithObj:curPriMsg];
         cellHeight += mediaViewHeight;
-        if (curPriMsg.voiceMedia || curPriMsg.file) {
+        if ([curPriMsg isVoice]) {
             cellHeight += kMessageCell_PadingHeight*2+40;
         } else {
             cellHeight += textSize.height + kMessageCell_PadingHeight*4;

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 ([curMsg isVoice]) {`
`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 (!([curMsg isVoice])) {`
`300`	`300`	`[menuItemArray addObject:@"拷贝"];`
`301`	`301`	`}`
`302`	`302`	`}`
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 ([_curPriMsg isVoice]) {`
`71`	`71`	`[textMsg setString:@"[语音]"];`
`72`	`72`	`if (_curPriMsg.played.intValue == 0) {`
`73`	`73`	`_msg.textColor = kColorBrandGreen;`