Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIChatConfiguration.swift

@@ -27,14 +27,15 @@ class YHAIChatConfiguration {
     
     func handleReceiveMessage(_ res: YHAIChatMessage?, _ done: Bool, _ messages: inout [YHAIChatMessage]) {
         
+        // 去除loading消息
+        removeThinkingMessageFromChatList(&messages)
+        
         if disableHandleMessage {
             for msg in messages {
                 msg.isDone = true
             }
             return
         }
-        // 去除loading消息
-        removeThinkingMessageFromChatList(&messages)
         
         if let res = res {
             var find = false
@@ -57,6 +58,7 @@ class YHAIChatConfiguration {
             if !find {
                 messages.append(res)
             }
+        }
         
         if done { // 思考完成
             for msg in messages {
@@ -64,7 +66,6 @@ class YHAIChatConfiguration {
             }
         }
     }
-    }
 
     
     func removeThinkingMessageFromChatList( _ messages: inout [YHAIChatMessage]) {

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIServiceListViewController.swift

@@ -166,12 +166,12 @@ extension YHAIServiceListViewController: UICollectionViewDelegate, UICollectionV
                 
             } else if model.redirectMode == 3 { // agent
                 
-                self.manager.getSubRobotChatConversationId(robotId: model.botId) {
+                self.manager.getSubRobotChatConversationId(robotId: model.redirectPath) {
                     sesseionId in
                     let vc = YHAIRobotChatViewController()
                     vc.isNeedShowBannerHeader = model.isNeedShowBannerHeader()
                     vc.myTitle = model.title
-                    vc.robotId = model.botId
+                    vc.robotId = model.redirectPath
                     vc.conversationId = sesseionId
                     vc.robotType = model.botType
                     self.navigationController?.pushViewController(vc, animated: true)

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/M/YHAIListModel.swift

@@ -34,7 +34,6 @@ class YHEntranceconfigModel: SmartCodable {
     var description: String = ""
     var btnText: String = ""
     var redirectMode: Int = 0
-    var botId: String = ""
     var botType: Int = 0  // 1：房产 2：教育 3：销售
     var redirectPath: String = ""