发送消息修改

SLAiELTS/SLAiELTS/Tool/NetWorking/SLHttpCenter.m

@@ -82,6 +82,7 @@ static SLHttpCenter *handle;
     url = [url hasPrefix:@"http"] ? url : [NSString stringWithFormat:@"%@%@",self.serverUrl,url];
     NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] requestWithMethod:@"POST" URLString:url parameters:nil error:nil];
     [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
+    [request setValue:[NSString stringWithFormat:@"Bearer %@",[SLGlobalInfo SharedInstance].loginInfo.token] forHTTPHeaderField:@"Authorization"];
     // 设置body
     [request setHTTPBody:body];
     [[handle dataTaskWithRequest:request uploadProgress:^(NSProgress * _Nonnull uploadProgress) {

SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Models/MessageModel.h

@@ -91,6 +91,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) NSString *timestamp;
 
+@property (nonatomic, assign) NSInteger chatType;
+
+@property (nonatomic, strong) NSString *toId;
+
+@property (nonatomic, strong) NSString *message;
+
+
 @end
 
 @interface SLMessageDetail : NSObject

SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Views/IMMessageView/YMIMMessageCollectionView.m

@@ -112,32 +112,30 @@
         dispatch_async(dispatch_get_main_queue(), ^{
 //            MBProgressHUD *hub = [MBProgressHUD showHUDAddedTo:self animated:YES];
 //            hub.label.text = @"正在发送...";
-            NSDictionary *body = @{@"chatType" : @"0", @"toId" : message.toId ?: @"", @"message" : message.sendText};
-            [[SLHttpCenter SharedInstance] postWithUrl:@"/api/Chat/SendMessage" body:[body mj_JSONData] success:^(id responseObject) {
-                
+            SLMessageSendModel *sendModel = [[SLMessageSendModel alloc] init];
+            sendModel.chatType = 0;
+            sendModel.toId = message.toId;
+            sendModel.message = message.sendText;
+            [[SLHttpCenter SharedInstance] postWithUrl:@"/api/Chat/SendMessage" body:[sendModel mj_JSONData] success:^(id responseObject) {
+//                [hub hideAnimated:YES];
+                if (msgModel.sendFailure) {
+                    msgModel.sendFailure = NO;
+                }
+                NSDictionary *dataDict = [responseObject objectForKey:@"data"];
+                NSString *dataStr = [dataDict objectForKey:@"data"];
+                NSString *str = [self replaceHasPrefix:@"\n" str:dataStr];
+                MessageModel *model = [MessageModel initWithSendText:str isReceive:YES showMike:message.isMike showText:!message.isMike isMike:message.isMike];
+                [self appendRequestMessage:model];
             } failure:^(SPRequestError *error) {
-                
+//                [hub hideAnimated:YES];
+                NSInteger i = [self.chatDataManager indexOfObject:msgModel];
+                if (i < self.chatDataManager.count && i > -1) {
+                    msgModel.sendFailure = YES;
+                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        [self updateMessage:msgModel idx:i];
+                    });
+                }
             }];
-//            [[SLHttpCenter SharedInstance] postWithUrl:@"/api/Chat/SendMessage" parameter:@{@"chatType" : @"0", @"toId" : message.toId ?: @"", @"message" : message.sendText} success:^(id responseObject) {
-////                [hub hideAnimated:YES];
-//                if (msgModel.sendFailure) {
-//                    msgModel.sendFailure = NO;
-//                }
-//                NSDictionary *dataDict = [responseObject objectForKey:@"data"];
-//                NSString *dataStr = [dataDict objectForKey:@"data"];
-//                NSString *str = [self replaceHasPrefix:@"\n" str:dataStr];
-//                MessageModel *model = [MessageModel initWithSendText:str isReceive:YES showMike:message.isMike showText:!message.isMike isMike:message.isMike];
-//                [self appendRequestMessage:model];
-//            } failure:^(SPRequestError *error) {
-////                [hub hideAnimated:YES];
-//                NSInteger i = [self.chatDataManager indexOfObject:msgModel];
-//                if (i < self.chatDataManager.count && i > -1) {
-//                    msgModel.sendFailure = YES;
-//                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                        [self updateMessage:msgModel idx:i];
-//                    });
-//                }
-//            }];
         });
     }
 }