Commit 4a65f4ea authored by Steven杜宇's avatar Steven杜宇

// AI

parent 036548b3
...@@ -17,7 +17,7 @@ class YHAIRobotChatViewController: YHBaseViewController { ...@@ -17,7 +17,7 @@ class YHAIRobotChatViewController: YHBaseViewController {
var listItemId: Int = 0 var listItemId: Int = 0
var isUserScrolling: Bool = false var isUserScrolling: Bool = false
var lastUserScrollTime: CFTimeInterval = 0.0 var lastUserScrollTime: CFTimeInterval = 0.0
let minimumScrollInterval: CFTimeInterval = 3.0 let minimumScrollInterval: CFTimeInterval = 2.0
var conversationId: String = "" var conversationId: String = ""
var messages:[YHAIChatMessage] = [] var messages:[YHAIChatMessage] = []
var isNeedShowBannerHeader: Bool = false var isNeedShowBannerHeader: Bool = false
...@@ -212,9 +212,9 @@ class YHAIRobotChatViewController: YHBaseViewController { ...@@ -212,9 +212,9 @@ class YHAIRobotChatViewController: YHBaseViewController {
let question = YHAIChatMessage.createQuestionMessage(text) let question = YHAIChatMessage.createQuestionMessage(text)
messages.append(question) messages.append(question)
messages.append(thinkingMessage) messages.append(thinkingMessage)
self.scrollToBottom()
self.bottomInputView.status = .loading self.bottomInputView.status = .loading
self.chatConfig.disableHandleMessage = false self.chatConfig.disableHandleMessage = false
self.scrollToBottom()
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 }
...@@ -269,8 +269,7 @@ class YHAIRobotChatViewController: YHBaseViewController { ...@@ -269,8 +269,7 @@ class YHAIRobotChatViewController: YHBaseViewController {
func uploadEvaluationMessage(_ msg: YHAIChatMessage, callback:((Bool)->())? = nil) { func uploadEvaluationMessage(_ msg: YHAIChatMessage, callback:((Bool)->())? = nil) {
viewModel.createMessage(conversationId: conversationId, role: "assistant", msg: msg) { viewModel.createMessage(conversationId: conversationId, role: "assistant", msg: msg) {
[weak self] success, error in success, error in
guard let self = self else { return }
callback?(success) callback?(success)
} }
} }
......
...@@ -119,6 +119,11 @@ class YHAIChatBannerView: UIView { ...@@ -119,6 +119,11 @@ class YHAIChatBannerView: UIView {
return collectView return collectView
}() }()
lazy var shadowView: YHAIChatShadowView = {
let v = YHAIChatShadowView()
return v
}()
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
createUI() createUI()
...@@ -130,11 +135,17 @@ class YHAIChatBannerView: UIView { ...@@ -130,11 +135,17 @@ class YHAIChatBannerView: UIView {
func createUI() { func createUI() {
addSubview(shadowView)
addSubview(bgImgV) addSubview(bgImgV)
bgImgV.addSubview(titleLabel) bgImgV.addSubview(titleLabel)
bgImgV.addSubview(descLabel) bgImgV.addSubview(descLabel)
bgImgV.addSubview(bannerView) bgImgV.addSubview(bannerView)
bannerView.addSubview(indicatorView) bannerView.addSubview(indicatorView)
shadowView.snp.makeConstraints { make in
make.left.right.bottom.equalTo(bgImgV)
make.top.equalTo(bgImgV.snp.top).offset(33)
}
bgImgV.snp.makeConstraints { make in bgImgV.snp.makeConstraints { make in
make.top.equalTo(0) make.top.equalTo(0)
......
...@@ -30,13 +30,35 @@ class YHAIJumpPageTool { ...@@ -30,13 +30,35 @@ class YHAIJumpPageTool {
if mode == YHAIJumpMode.web.rawValue { // if mode == YHAIJumpMode.web.rawValue { //
if !path.isEmpty { if !path.isEmpty {
var url = path
if YHLoginManager.shared.isLogin() {
let token = YHLoginManager.shared.h5Token
url = path + "?param=" + token
let urlHasParam = String.hasQueryParameters(urlString: path)
if urlHasParam {
url = path + "&param=" + token
}
} else {
url = path
}
//2.增加导航栏高度
var resultUrl = url
if !url.contains("navigationH=") {
resultUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
if url.contains("?") {
resultUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
}
}
if type == .evaluation { if type == .evaluation {
YHAIEvaluationWebView.webView(url: path, finishBlock: block).show() YHAIEvaluationWebView.webView(url: resultUrl, finishBlock: block).show()
} else { } else {
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = path vc.url = resultUrl
vc.evaluationResultCallback = block vc.evaluationResultCallback = block
UIViewController.current?.navigationController?.pushViewController(vc, animated: true) UIViewController.current?.navigationController?.pushViewController(vc, animated: true)
} }
......
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