update

mengyaoyao · mengyaoyao · commit 9f669f94aaac · 2017-05-31T16:28:55.000+08:00
diff --git a/CocoaAsyncSocket_TCP/ChatHandler/ChatHandler.m b/CocoaAsyncSocket_TCP/ChatHandler/ChatHandler.m
@@ -362,6 +362,7 @@ - (void)sendTextMessage:(ChatModel *)textModel
         reply.contenType = Content_Text;
         reply.toUserID = textModel.fromUserID;
         reply.chatType = @"userChat";
+        reply.byMyself = @0;
         ChatMessageType type = ChatMessageType_Normal;
         for (id<ChatHandlerDelegate>delegate in self.delegates) {
             if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {
@@ -399,6 +400,7 @@ - (void)sendAudioMessage:(ChatModel *)audioModel
         reply.contenType = Content_Text;
         reply.toUserID = audioModel.fromUserID;
         reply.chatType = @"userChat";
+        reply.byMyself = @0;
         ChatMessageType type = ChatMessageType_Normal;
         for (id<ChatHandlerDelegate>delegate in self.delegates) {
             if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {
@@ -438,6 +440,7 @@ - (void)sendPicMessage:(NSArray<ChatModel *>*)picModels
             reply.contenType = Content_Text;
             reply.toUserID = obj.fromUserID;
             reply.chatType = @"userChat";
+            reply.byMyself = @0;
             ChatMessageType type = ChatMessageType_Normal;
             for (id<ChatHandlerDelegate>delegate in self.delegates) {
                 if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {
diff --git a/CocoaAsyncSocket_TCP/Controller/ChatViewController.m b/CocoaAsyncSocket_TCP/Controller/ChatViewController.m
@@ -304,6 +304,7 @@ - (void)sendPictureMessage:(NSArray<ChatAlbumModel *> *)picModels
     [self.talkMessages addObjectsFromArray:picMessages];
     [self.chatTableView reloadData];
     [self scrollToBottom];
+    [[ChatHandler shareInstance]sendPicMessage:picMessages];
 }
 
 #pragma mark - 发送视频消息
diff --git a/CocoaAsyncSocket_TCP/View/ChatCells/ChatAudioCell.m b/CocoaAsyncSocket_TCP/View/ChatCells/ChatAudioCell.m
@@ -195,7 +195,7 @@ - (void)setAudioModel:(ChatModel *)audioModel
     self.timeContainer.hidden = !audioModel.shouldShowTime;
     //处理失败按钮
     BOOL isSend   = [audioModel.isSend integerValue];
-    self.failureButton.hidden   = isSend || audioModel.isSending.integerValue;
+    self.failureButton.hidden   = isSend || audioModel.isSending.integerValue || !audioModel.byMyself.integerValue;
     //昵称隐藏处理
     self.nickNameLabel.hidden = audioModel.byMyself.integerValue || hashEqual(audioModel.chatType, @"userChat");
     //红点隐藏处理
diff --git a/CocoaAsyncSocket_TCP/View/ChatCells/ChatTextCell.m b/CocoaAsyncSocket_TCP/View/ChatCells/ChatTextCell.m
@@ -165,7 +165,7 @@ - (void)setTextModel:(ChatModel *)textModel
     //处理转圈
     textModel.isSending.integerValue &&textModel.byMyself.integerValue ? [self.activiView startAnimating] : [self.activiView stopAnimating];
     //处理红叹号
-    self.failureButton.hidden = textModel.isSend.integerValue || textModel.isSending.integerValue || textModel.byMyself.integerValue;
+    self.failureButton.hidden = textModel.isSend.integerValue || textModel.isSending.integerValue || !textModel.byMyself.integerValue;
     //处理昵称显示
     self.nickNameLabel.hidden = textModel.byMyself.integerValue || hashEqual(textModel.chatType, @"userChat");
     //赋值
diff --git a/CocoaAsyncSocket_TCP/View/KeyBoard/ChatKeyboard.m b/CocoaAsyncSocket_TCP/View/KeyBoard/ChatKeyboard.m
@@ -682,6 +682,8 @@ - (void)dealloc
 - (void)keyboardResignFirstResponder:(NSNotification *)note
 {
     [self.msgTextView resignFirstResponder];
+    //按钮初始化刷新
+    [self reloadSwitchButtons];
     [self customKeyboardMove:SCREEN_HEIGHT - Height(self.messageBar.frame)];
 }
 

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 - 发送视频消息`
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`