Commit 70413cb7 authored by Steven杜宇's avatar Steven杜宇

// AI

parent a59adcac
...@@ -121,8 +121,8 @@ class YHAIMainChatViewController: YHBaseViewController { ...@@ -121,8 +121,8 @@ class YHAIMainChatViewController: YHBaseViewController {
DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
if isNeedAccurate { if isNeedAccurate {
self.tableView.setContentOffset(.zero, animated: true) // self.tableView.setContentOffset(.zero, animated: true)
self.tableView.setContentOffset(CGPointMake(0, 90000), animated: true) // self.tableView.setContentOffset(CGPointMake(0, 90000), animated: true)
} }
...@@ -151,12 +151,18 @@ class YHAIMainChatViewController: YHBaseViewController { ...@@ -151,12 +151,18 @@ class YHAIMainChatViewController: YHBaseViewController {
self.manager.requestAI(botId: self.robotId, conversationId: self.conversationId, question:text) { self.manager.requestAI(botId: self.robotId, conversationId: self.conversationId, question:text) {
[weak self] res, done in [weak self] res, done in
guard let self = self else { return } guard let self = self else { return }
self.chatConfig.handleReceiveMessage(res, done, &messages)
if done { DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
print("RESPONSE-DONE") [weak self] in
self.bottomInputView.status = self.bottomInputView.textView.text.isEmpty ? .disableSend : .enableSend guard let self = self else { return }
self.chatConfig.handleReceiveMessage(res, done, &messages)
if done {
print("RESPONSE-DONE")
self.bottomInputView.status = self.bottomInputView.textView.text.isEmpty ? .disableSend : .enableSend
}
self.reloadAndScrollToBottom(forceScrollToBottom)
} }
self.reloadAndScrollToBottom(forceScrollToBottom)
} }
} }
} }
......
...@@ -92,6 +92,7 @@ class YHAIRequestManager: NSObject { ...@@ -92,6 +92,7 @@ class YHAIRequestManager: NSObject {
switch result { switch result {
case let .success(string): case let .success(string):
print(string) print(string)
self.handle(dataString: string) { self.handle(dataString: string) {
response, done in response, done in
callback?(response, done) callback?(response, done)
...@@ -228,36 +229,36 @@ class YHAIRequestManager: NSObject { ...@@ -228,36 +229,36 @@ class YHAIRequestManager: NSObject {
self.uuid = UUID().uuidString + NSDate().timeIntervalSince1970.description self.uuid = UUID().uuidString + NSDate().timeIntervalSince1970.description
} }
if receiveMessage.isUserfulMessage() {
completion?(receiveMessage, sessionDone)
}
// if receiveMessage.isUserfulMessage() { // if receiveMessage.isUserfulMessage() {
// if receiveMessage.isNeedSpiceMessage() { // completion?(receiveMessage, sessionDone)
// let text = receiveMessage.body.contentText
// if text.count > 1 {
// let textArray = Array(text)
// for (index, character) in textArray.enumerated() {
// let msg = receiveMessage.copy() as! YHAIChatMessage
// msg.body.contentText = String(character)
// msg.body.status = ""
// if index == textArray.count-1 {
// msg.body.status = receiveMessage.body.status
// }
// msg.updateBodyToData()
// printLog("AAAAA- \(msg)")
// sessionDone = receiveMessage.body.isDone()
// completion?(msg, sessionDone)
// }
//
// } else {
// completion?(receiveMessage, sessionDone)
// }
//
// } else {
// completion?(receiveMessage, sessionDone)
// }
// } // }
if receiveMessage.isUserfulMessage() {
if receiveMessage.isNeedSpiceMessage() {
let text = receiveMessage.body.contentText
if text.count > 1 {
let textArray = Array(text)
for (index, character) in textArray.enumerated() {
let msg = receiveMessage.copy() as! YHAIChatMessage
msg.body.contentText = String(character)
msg.body.status = ""
if index == textArray.count-1 {
msg.body.status = receiveMessage.body.status
}
msg.updateBodyToData()
printLog("AAAAA- \(msg)")
sessionDone = receiveMessage.body.isDone()
completion?(msg, sessionDone)
}
} else {
completion?(receiveMessage, sessionDone)
}
} else {
completion?(receiveMessage, sessionDone)
}
}
} }
} // arr 结束 } // arr 结束
} }
......
...@@ -196,11 +196,10 @@ class YHAIRobotChatViewController: YHBaseViewController { ...@@ -196,11 +196,10 @@ class YHAIRobotChatViewController: YHBaseViewController {
DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
if isNeedAccurate { if isNeedAccurate {
self.tableView.setContentOffset(.zero, animated: true) // self.tableView.setContentOffset(.zero, animated: true)
self.tableView.setContentOffset(CGPointMake(0, 90000), animated: true) // self.tableView.setContentOffset(CGPointMake(0, 90000), animated: true)
} }
// 使用 performBatchUpdates 来确保所有布局更新完成后再滚动 // 使用 performBatchUpdates 来确保所有布局更新完成后再滚动
self.tableView.performBatchUpdates(nil) { _ in self.tableView.performBatchUpdates(nil) { _ in
// 在布局更新完成后执行滚动 // 在布局更新完成后执行滚动
...@@ -224,12 +223,18 @@ class YHAIRobotChatViewController: YHBaseViewController { ...@@ -224,12 +223,18 @@ class YHAIRobotChatViewController: YHBaseViewController {
self.manager.requestAI(botId: self.robotId, conversationId: self.conversationId, question:text) { self.manager.requestAI(botId: self.robotId, conversationId: self.conversationId, question:text) {
[weak self] res, done in [weak self] res, done in
guard let self = self else { return } guard let self = self else { return }
self.chatConfig.handleReceiveMessage(res, done, &messages)
if done { DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
print("RESPONSE-DONE") [weak self] in
self.bottomInputView.status = self.bottomInputView.textView.text.isEmpty ? .disableSend : .enableSend guard let self = self else { return }
self.chatConfig.handleReceiveMessage(res, done, &messages)
if done {
print("RESPONSE-DONE")
self.bottomInputView.status = self.bottomInputView.textView.text.isEmpty ? .disableSend : .enableSend
}
self.reloadAndScrollToBottom(forceScrollToBottom)
} }
self.reloadAndScrollToBottom(forceScrollToBottom)
} }
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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