Commit a54bcece authored by Steven杜宇's avatar Steven杜宇

// AI

parent 9e102e1c
...@@ -40,7 +40,7 @@ class YHAIChatConfiguration { ...@@ -40,7 +40,7 @@ class YHAIChatConfiguration {
if let res = res { if let res = res {
var find = false var find = false
for msg in messages { for msg in messages {
if msg.uuid == res.uuid { if msg.messageId == res.messageId {
if msg.isNeedSpiceMessage(), res.isNeedSpiceMessage() { if msg.isNeedSpiceMessage(), res.isNeedSpiceMessage() {
// 多个文字需要拼接 // 多个文字需要拼接
find = true find = true
......
...@@ -165,11 +165,11 @@ class YHAIMainChatViewController: YHBaseViewController { ...@@ -165,11 +165,11 @@ class YHAIMainChatViewController: YHBaseViewController {
} }
} }
let uuids = messages.map { let uuids = messages.map {
return $0.uuid return $0.messageId
} }
// 过滤掉当前相同消息 // 过滤掉当前相同消息
results = results.filter { results = results.filter {
return !uuids.contains($0.uuid) return !uuids.contains($0.messageId)
} }
messages.insert(contentsOf: results, at: 0) messages.insert(contentsOf: results, at: 0)
self.tableView.reloadData() self.tableView.reloadData()
......
...@@ -175,7 +175,7 @@ class YHAIRequestManager: NSObject { ...@@ -175,7 +175,7 @@ class YHAIRequestManager: NSObject {
let lines = text.components(separatedBy: "\n") let lines = text.components(separatedBy: "\n")
if lines.count > 0 { if lines.count > 0 {
let receiveMessage = YHAIChatMessage() let receiveMessage = YHAIChatMessage()
receiveMessage.uuid = uuid receiveMessage.messageId = uuid
for line in lines { for line in lines {
if line.starts(with: prefix_id) { if line.starts(with: prefix_id) {
if let idRange = line.range(of: prefix_id) { if let idRange = line.range(of: prefix_id) {
......
...@@ -179,11 +179,11 @@ class YHAIRobotChatViewController: YHBaseViewController { ...@@ -179,11 +179,11 @@ class YHAIRobotChatViewController: YHBaseViewController {
} }
let uuids = messages.map { let uuids = messages.map {
return $0.uuid return $0.messageId
} }
// 过滤掉当前相同消息 // 过滤掉当前相同消息
results = results.filter { results = results.filter {
return !uuids.contains($0.uuid) return !uuids.contains($0.messageId)
} }
messages.insert(contentsOf: results, at: 0) messages.insert(contentsOf: results, at: 0)
self.tableView.reloadData() self.tableView.reloadData()
......
...@@ -47,7 +47,7 @@ class YHAIChatDBMessage: Object { ...@@ -47,7 +47,7 @@ class YHAIChatDBMessage: Object {
static func createMessage(_ message: YHAIChatMessage) -> YHAIChatDBMessage { static func createMessage(_ message: YHAIChatMessage) -> YHAIChatDBMessage {
let msg = YHAIChatDBMessage() let msg = YHAIChatDBMessage()
msg.uuid = message.uuid msg.uuid = message.messageId
msg.id = message.id msg.id = message.id
msg.event = message.event msg.event = message.event
msg.data = message.data msg.data = message.data
...@@ -60,7 +60,7 @@ class YHAIChatDBMessage: Object { ...@@ -60,7 +60,7 @@ class YHAIChatDBMessage: Object {
func getMessage() -> YHAIChatMessage { func getMessage() -> YHAIChatMessage {
let msg = YHAIChatMessage() let msg = YHAIChatMessage()
msg.uuid = self.uuid msg.messageId = self.uuid
msg.id = self.id msg.id = self.id
msg.event = self.event msg.event = self.event
msg.data = self.data msg.data = self.data
......
...@@ -28,7 +28,7 @@ class YHAIHistoryMessage: SmartCodable { ...@@ -28,7 +28,7 @@ class YHAIHistoryMessage: SmartCodable {
func convertToChatMessage() -> YHAIChatMessage { func convertToChatMessage() -> YHAIChatMessage {
let msg = YHAIChatMessage() let msg = YHAIChatMessage()
msg.uuid = self.messageId msg.messageId = self.messageId
msg.isSelf = self.role == "user" msg.isSelf = self.role == "user"
msg.isDone = true msg.isDone = true
let body = YHAIMessageBody() let body = YHAIMessageBody()
......
...@@ -35,7 +35,7 @@ class YHAIChatMessage: CustomStringConvertible { ...@@ -35,7 +35,7 @@ class YHAIChatMessage: CustomStringConvertible {
var data: String = "" var data: String = ""
var dataDict: [String : Any] = [:] var dataDict: [String : Any] = [:]
var uuid: String = "" var messageId: String = ""
var isSelf: Bool = false var isSelf: Bool = false
var isDone: Bool = false var isDone: Bool = false
...@@ -74,7 +74,7 @@ class YHAIChatMessage: CustomStringConvertible { ...@@ -74,7 +74,7 @@ class YHAIChatMessage: CustomStringConvertible {
body.contentText = text body.contentText = text
question.setFinished() question.setFinished()
question.body = body question.body = body
question.uuid = UUID().uuidString + NSDate().timeIntervalSince1970.description question.messageId = UUID().uuidString + NSDate().timeIntervalSince1970.description
question.updateBodyToData() question.updateBodyToData()
return question return question
} }
...@@ -86,14 +86,14 @@ class YHAIChatMessage: CustomStringConvertible { ...@@ -86,14 +86,14 @@ class YHAIChatMessage: CustomStringConvertible {
body.contentType = YHAIMessageType.thinking.rawValue body.contentType = YHAIMessageType.thinking.rawValue
message.setFinished() message.setFinished()
message.body = body message.body = body
message.uuid = UUID().uuidString + NSDate().timeIntervalSince1970.description message.messageId = UUID().uuidString + NSDate().timeIntervalSince1970.description
message.updateBodyToData() message.updateBodyToData()
return message return message
} }
static func createTextMesssage(text: String) -> YHAIChatMessage { static func createTextMesssage(text: String) -> YHAIChatMessage {
let message = YHAIChatMessage() let message = YHAIChatMessage()
message.uuid = UUID().uuidString + NSDate().timeIntervalSince1970.description message.messageId = UUID().uuidString + NSDate().timeIntervalSince1970.description
message.isSelf = false message.isSelf = false
let body = YHAIMessageBody() let body = YHAIMessageBody()
body.contentType = YHAIMessageType.text.rawValue body.contentType = YHAIMessageType.text.rawValue
...@@ -106,7 +106,7 @@ class YHAIChatMessage: CustomStringConvertible { ...@@ -106,7 +106,7 @@ class YHAIChatMessage: CustomStringConvertible {
static func createPictureMessage(url: String, imgType: Int) -> YHAIChatMessage { static func createPictureMessage(url: String, imgType: Int) -> YHAIChatMessage {
let message = YHAIChatMessage() let message = YHAIChatMessage()
message.uuid = UUID().uuidString + NSDate().timeIntervalSince1970.description message.messageId = UUID().uuidString + NSDate().timeIntervalSince1970.description
message.isSelf = false message.isSelf = false
let body = YHAIMessageBody() let body = YHAIMessageBody()
message.setFinished() message.setFinished()
...@@ -178,7 +178,7 @@ class YHAIChatMessage: CustomStringConvertible { ...@@ -178,7 +178,7 @@ class YHAIChatMessage: CustomStringConvertible {
} }
var description: String { var description: String {
return "uudi:\(uuid)\n id: \(id)\n event: \(event)\n data:\(data)\n \n" return "uudi:\(messageId)\n id: \(id)\n event: \(event)\n data:\(data)\n \n"
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment