2
0
Quellcode durchsuchen

语音类型字段修改

桂欢 vor 1 Jahr
Ursprung
Commit
91766669f4

+ 6 - 1
SLAiELTS/SLAiELTS/ViewControllers/MessageVC/Models/MessageModel.h

@@ -123,6 +123,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @property (nonatomic, strong) NSString *Message;
 @property (nonatomic, strong) NSString *Message;
 
 
+//文字0 语音1
+@property (nonatomic, assign) BOOL MessageType;
+
+//私聊0 群聊1
 @property (nonatomic, assign) BOOL ChatType;
 @property (nonatomic, assign) BOOL ChatType;
 
 
 @end
 @end
@@ -143,8 +147,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @property (nonatomic, strong) NSString *message;
 @property (nonatomic, strong) NSString *message;
 
 
-@property (nonatomic, strong) NSString *messageType;
+@property (nonatomic, assign) BOOL messageType;
 
 
+//是否语音
 @property (nonatomic, assign) BOOL interactMode;
 @property (nonatomic, assign) BOOL interactMode;
 
 
 @end
 @end

+ 9 - 3
SLAiELTS/SLAiELTS/ViewControllers/MessageVC/SLMessageViewController.m

@@ -67,7 +67,7 @@
         SLSocketMessage *msgModel = [SLSocketMessage mj_objectWithKeyValues:[resultDic objectForKey:@"Data"]];
         SLSocketMessage *msgModel = [SLSocketMessage mj_objectWithKeyValues:[resultDic objectForKey:@"Data"]];
         if ([self.friendModel.userId isEqualToString:msgModel.AIId]) {
         if ([self.friendModel.userId isEqualToString:msgModel.AIId]) {
             NSString *str = [self replaceHasPrefix:@"\n" str:msgModel.Message];
             NSString *str = [self replaceHasPrefix:@"\n" str:msgModel.Message];
-            MessageModel *model = [MessageModel initWithSendText:str isReceive:YES showMike:msgModel.ChatType showText:!msgModel.ChatType isMike:msgModel.ChatType];
+            MessageModel *model = [MessageModel initWithSendText:str isReceive:YES showMike:msgModel.MessageType showText:!msgModel.MessageType isMike:msgModel.MessageType];
             [self.chatServiceView.messageView appendRequestMessage:model];
             [self.chatServiceView.messageView appendRequestMessage:model];
         }else {
         }else {
             [[SLMessageManager SharedInstance] saveSocketChatMessageWith:resultDic];
             [[SLMessageManager SharedInstance] saveSocketChatMessageWith:resultDic];
@@ -159,8 +159,14 @@
                     addIdx = idx;
                     addIdx = idx;
                 }
                 }
                 if (addIdx != 0 && idx > addIdx) {
                 if (addIdx != 0 && idx > addIdx) {
-                    MessageModel *model = [MessageModel initWithSendText:obj.message isReceive:obj.interactMode showMike:NO showText:YES isMike:NO];
-                    [marr addObject:model];
+                    if (obj.interactMode) {
+                        MessageModel *model = [MessageModel initWithSendText:obj.message isReceive:obj.interactMode showMike:NO showText:YES isMike:NO];
+                        [marr addObject:model];
+                    }else {
+                        MessageModel *model = [MessageModel initWithSendText:obj.message isReceive:obj.interactMode showMike:obj.messageType showText:!obj.messageType isMike:obj.messageType];
+                        [marr addObject:model];
+                    }
+                    
                 }
                 }
             }];
             }];
             if (marr.count != chatModels.count) {
             if (marr.count != chatModels.count) {