update

mengyaoyao · mengyaoyao · commit 66c3b0b656fd · 2017-06-01T10:27:02.000+08:00
diff --git a/CocoaAsyncSocket_TCP/ChatHandler/ChatHandler.m b/CocoaAsyncSocket_TCP/ChatHandler/ChatHandler.m
@@ -339,7 +339,7 @@ - (void)sendTextMessage:(ChatModel *)textModel
 {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         
-        //模拟回执
+        //模拟服务器回执
         ChatModel *receipet = [[ChatModel alloc]init];
         receipet.messageType = Message_NormalReceipt;
         receipet.sendTime = textModel.sendTime;
@@ -375,9 +375,10 @@ - (void)sendTextMessage:(ChatModel *)textModel
 //发送语音消息
 - (void)sendAudioMessage:(ChatModel *)audioModel
 {
+    //此处调用上传 , 上传成功后调用socket发送消息
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         
-        //模拟回执
+        //模拟服务器回执
         ChatModel *receipet = [[ChatModel alloc]init];
         receipet.messageType = Message_NormalReceipt;
         receipet.sendTime = audioModel.sendTime;
@@ -413,14 +414,16 @@ - (void)sendAudioMessage:(ChatModel *)audioModel
 //发送图片消息
 - (void)sendPicMessage:(NSArray<ChatModel *>*)picModels
 {
-    
+ 
+    //此处调用上传 , 上传成功后调用socket发送消息
     [picModels enumerateObjectsUsingBlock:^(ChatModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             
-            //模拟回执
+            //模拟服务器回执
             ChatModel *receipet = [[ChatModel alloc]init];
             receipet.messageType = Message_NormalReceipt;
             receipet.sendTime = obj.sendTime;
+            NSLog(@"---回执--%@",receipet.sendTime);
             ChatMessageType type = ChatMessageType_NormalReceipt;
             for (id<ChatHandlerDelegate>delegate in self.delegates) {
                 if ([delegate respondsToSelector:@selector(didReceiveMessage:type:)]) {
diff --git a/CocoaAsyncSocket_TCP/ChatHandler/ChatUtil.m b/CocoaAsyncSocket_TCP/ChatHandler/ChatUtil.m
@@ -129,7 +129,7 @@ + (ChatModel *)creatMessageModel:(ChatModel *)config
     chatModel.groupName    = config.groupName;
     chatModel.noDisturb       = config.noDisturb;
     
-    return chatModel;
+    return chatModel; 
 }
 
 //初始化文本消息模型
diff --git a/CocoaAsyncSocket_TCP/View/ChatCells/ChatImageCell.m b/CocoaAsyncSocket_TCP/View/ChatCells/ChatImageCell.m
@@ -171,7 +171,7 @@ - (void)setImageModel:(ChatModel *)imageModel
     //处理失败按钮 , 处理进度按钮 ,昵称隐藏处理
     BOOL isSend   = [imageModel.isSend integerValue];
     self.failureButton.hidden    = !imageModel.byMyself.integerValue || isSend || imageModel.isSending.integerValue;
-    self.progressLabel.hidden  = !imageModel.byMyself.integerValue || imageModel.isSending.integerValue;
+    self.progressLabel.hidden  = !imageModel.byMyself.integerValue || !imageModel.isSending.integerValue;
     self.nickNameLabel.hidden = imageModel.byMyself.integerValue || hashEqual(imageModel.chatType, @"userChat");
         
     //赋值

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ + (ChatModel )creatMessageModel:(ChatModel )config`
`129`	`129`	`chatModel.groupName = config.groupName;`
`130`	`130`	`chatModel.noDisturb = config.noDisturb;`
`131`	`131`
`132`		`- return chatModel;`
	`132`	`+ return chatModel;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`//初始化文本消息模型`