Commit 9f669f9

author

mengyaoyao

committed

update

1 parent 8622ab1 commit 9f669f9Copy full SHA for 9f669f9

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,7 @@ - (void)sendTextMessage:(ChatModel *)textModel`
`362`	`362`	`reply.contenType = Content_Text;`
`363`	`363`	`reply.toUserID = textModel.fromUserID;`
`364`	`364`	`reply.chatType = @"userChat";`
	`365`	`+ reply.byMyself = @0;`
`365`	`366`	`ChatMessageType type = ChatMessageType_Normal;`
`366`	`367`	`for (id<ChatHandlerDelegate>delegate in self.delegates) {`
`367`	`368`	`if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {`
`@@ -399,6 +400,7 @@ - (void)sendAudioMessage:(ChatModel *)audioModel`
`399`	`400`	`reply.contenType = Content_Text;`
`400`	`401`	`reply.toUserID = audioModel.fromUserID;`
`401`	`402`	`reply.chatType = @"userChat";`
	`403`	`+ reply.byMyself = @0;`
`402`	`404`	`ChatMessageType type = ChatMessageType_Normal;`
`403`	`405`	`for (id<ChatHandlerDelegate>delegate in self.delegates) {`
`404`	`406`	`if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {`
`@@ -438,6 +440,7 @@ - (void)sendPicMessage:(NSArray<ChatModel >)picModels`
`438`	`440`	`reply.contenType = Content_Text;`
`439`	`441`	`reply.toUserID = obj.fromUserID;`
`440`	`442`	`reply.chatType = @"userChat";`
	`443`	`+ reply.byMyself = @0;`
`441`	`444`	`ChatMessageType type = ChatMessageType_Normal;`
`442`	`445`	`for (id<ChatHandlerDelegate>delegate in self.delegates) {`
`443`	`446`	`if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@ - (void)sendPictureMessage:(NSArray<ChatAlbumModel > )picModels`
`304`	`304`	`[self.talkMessages addObjectsFromArray:picMessages];`
`305`	`305`	`[self.chatTableView reloadData];`
`306`	`306`	`[self scrollToBottom];`
	`307`	`+ [[ChatHandler shareInstance]sendPicMessage:picMessages];`
`307`	`308`	`}`
`308`	`309`
`309`	`310`	`#pragma mark - 发送视频消息`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ - (void)setAudioModel:(ChatModel *)audioModel`
`195`	`195`	`self.timeContainer.hidden = !audioModel.shouldShowTime;`
`196`	`196`	`//处理失败按钮`
`197`	`197`	`BOOL isSend = [audioModel.isSend integerValue];`
`198`		`- self.failureButton.hidden = isSend \|\| audioModel.isSending.integerValue;`
	`198`	`+ self.failureButton.hidden = isSend \|\| audioModel.isSending.integerValue \|\| !audioModel.byMyself.integerValue;`
`199`	`199`	`//昵称隐藏处理`
`200`	`200`	`self.nickNameLabel.hidden = audioModel.byMyself.integerValue \|\| hashEqual(audioModel.chatType, @"userChat");`
`201`	`201`	`//红点隐藏处理`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ - (void)setTextModel:(ChatModel *)textModel`
`165`	`165`	`//处理转圈`
`166`	`166`	`textModel.isSending.integerValue &&textModel.byMyself.integerValue ? [self.activiView startAnimating] : [self.activiView stopAnimating];`
`167`	`167`	`//处理红叹号`
`168`		`- self.failureButton.hidden = textModel.isSend.integerValue \|\| textModel.isSending.integerValue \|\| textModel.byMyself.integerValue;`
	`168`	`+ self.failureButton.hidden = textModel.isSend.integerValue \|\| textModel.isSending.integerValue \|\| !textModel.byMyself.integerValue;`
`169`	`169`	`//处理昵称显示`
`170`	`170`	`self.nickNameLabel.hidden = textModel.byMyself.integerValue \|\| hashEqual(textModel.chatType, @"userChat");`
`171`	`171`	`//赋值`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -682,6 +682,8 @@ - (void)dealloc`
`682`	`682`	`- (void)keyboardResignFirstResponder:(NSNotification *)note`
`683`	`683`	`{`
`684`	`684`	`[self.msgTextView resignFirstResponder];`
	`685`	`+ //按钮初始化刷新`
	`686`	`+ [self reloadSwitchButtons];`
`685`	`687`	`[self customKeyboardMove:SCREEN_HEIGHT - Height(self.messageBar.frame)];`
`686`	`688`	`}`
`687`	`689`

Comments

(0)