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

# Conflicts:
#	galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

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

@@ -191,7 +191,7 @@ class YHAIMainChatViewController: YHBaseViewController {
         self.viewModel.getBotConfigInfoWithBotId(self.robotId) {
             [weak self] success, error in
             guard let self = self else { return }
-            var message = self.viewModel.botConfig.onboardingInfo.prologue
+            let message = self.viewModel.botConfig.onboardingInfo.prologue
             autoResponseTextMessage(message)
         }
     }

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

@@ -16,6 +16,7 @@ class YHAIRobotChatViewController: YHBaseViewController {
     var robotId: String = ""
     var listItemId: Int = 0
     var disableScrollToBottom: Bool = false
+    var isHaveAutoResponseText = false
     var conversationId: String = ""
     var messages:[YHAIChatMessage] = []
     var isNeedShowBannerHeader: Bool = false
@@ -159,7 +160,6 @@ class YHAIRobotChatViewController: YHBaseViewController {
         }
         
         getHistoryMessages()
-        getBotConfig()
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -195,7 +195,9 @@ class YHAIRobotChatViewController: YHBaseViewController {
                     self.bannerView.messages = ["香港教育有哪些优势？", "去香港读书有哪些条件？", "申请香港学校费用是多少？", "了解银河教育插班服务流程", "了解银河教育插班录取率"]
                 }
             }
+            autoResponseLocalTextMessage()
         }
+        
     }
     
     func reloadAndScrollToBottom() {
@@ -270,22 +272,38 @@ class YHAIRobotChatViewController: YHBaseViewController {
             }
             messages.insert(contentsOf: results, at: 0)
             reloadAndScrollToBottom()
+            getBotConfig()
+        }
+    }
     
-            autoResponseLocalTextMessage()
+    func autoResponseTextMessage(_ message: String) {
+        if message.isEmpty {
+            return
+        }
+        if messages.count <= 0 || !isHaveAutoResponseText {
+            isHaveAutoResponseText = true
+            let msg = self.chatConfig.createRobotResponseTextMessage(message)
+            messages.append(msg)
+            self.reloadAndScrollToBottom()
         }
     }
     
     func autoResponseLocalTextMessage() {
         if messages.count <= 0 {
-            if robotType == YHAIRobotType.sale.rawValue {
-                let text = "你好，我是新港生活规划师，如果您有关于香港身份政策或者办理细节方面的问题，可以随时问我哦。"
-                let msg = self.chatConfig.createRobotResponseTextMessage(text)
-                messages.append(msg)
-                
-            } else if robotType == YHAIRobotType.main.rawValue {
-                let text = "您好，我是港小宝，为新中产提供一站式服务。您有香港身份和生活的问题，可以咨询我~"
-                let msg = self.chatConfig.createRobotResponseTextMessage(text)
-                messages.append(msg)
+//            if robotType == YHAIRobotType.sale.rawValue {
+//                let text = "你好，我是新港生活规划师，如果您有关于香港身份政策或者办理细节方面的问题，可以随时问我哦。"
+//                let msg = self.chatConfig.createRobotResponseTextMessage(text)
+//                messages.append(msg)
+//                
+//            } else if robotType == YHAIRobotType.main.rawValue {
+//                let text = "您好，我是港小宝，为新中产提供一站式服务。您有香港身份和生活的问题，可以咨询我~"
+//                let msg = self.chatConfig.createRobotResponseTextMessage(text)
+//                messages.append(msg)
+//            }
+            
+            if robotType != YHAIRobotType.image.rawValue {
+                let message = self.viewModel.botConfig.onboardingInfo.prologue
+                autoResponseTextMessage(message)
             }
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift

@@ -26,6 +26,7 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
     
     private var timer : Timer?
     private var finishHandleFlag : Bool = true
+    private var isSaving:  Bool = false
     
     
     override func viewDidLoad() {
@@ -50,6 +51,38 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
         cancelTimer()
     }
     
+    override func backItemClick(_ sender: Any) {
+        guard !isSaving else {
+            return
+        }
+        isSaving = true
+        saveOp { [weak self] _ in
+            self?.isSaving = false
+            if let navigationController = self?.navigationController {
+                navigationController.popViewController(animated: true)
+            } else {
+                self?.dismiss(animated: true)
+            }
+        }
+    }
+
+    /// 是否可以返回，包括点击返回和手势返回，默认YES
+    override func navigationShouldPop() -> Bool {
+        guard !isSaving else {
+            return false
+        }
+        isSaving = true
+        saveOp { [weak self] _ in
+            self?.isSaving = false
+            if let navigationController = self?.navigationController {
+                navigationController.popViewController(animated: true)
+            } else {
+                self?.dismiss(animated: true)
+            }
+        }
+        return false
+    }
+    
     private var bottomView : UIView = {
         let view = UIView()
         view.backgroundColor = .white
@@ -155,6 +188,41 @@ extension YHHKPlanDoctumentVC {
         return false
     }
     
+    //保存数据
+    private func saveOp(completion: @escaping (Bool) -> Void) {
+        
+        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+            let params = ["order_id":orderID,
+                          "supplement_id":supplement_id,
+                          "career_achievement":viewModel.arrHKPlanData[0].content,
+                          "academic_achievement":viewModel.arrHKPlanData[1].content,
+                          "qualifications_and_awards":viewModel.arrHKPlanData[2].content,
+                          "professional_skills":viewModel.arrHKPlanData[3].content,
+                          "visa_contribution":viewModel.arrHKPlanData[4].content,
+                          "plan_detail":viewModel.arrHKPlanData[5].content,
+                          "other":viewModel.arrHKPlanData[6].content,
+                          "content_save":0]
+            
+            YHHUD.show(.progress(message: ""))
+            viewModel.submitHKPlanDocument(params) {[weak self ] success, error in
+                guard let self = self else { return }
+                YHHUD.hide()
+                if success {
+                    YHHUD.flash(message: "保存成功")
+                    self.getData()
+                    completion(true)
+                } else {
+                    YHHUD.flash(message: error?.errorMsg ?? "保存失败")
+                    completion(false)
+                }
+            }
+            
+        } else {
+            YHHUD.flash(message: "订单ID 为空")
+            completion(false)
+        }
+    }
+    
     //提交数据
     private func submitOp() {
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHImproveSchemeViewController.swift

@@ -101,13 +101,19 @@ class YHImproveSchemeViewController: YHBaseViewController {
     lazy var bottomView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
+        view.addSubview(saveBtn)
         view.addSubview(leftBtn)
         view.addSubview(rightBtn)
         
+        saveBtn.snp.makeConstraints { make in
+            make.top.equalTo(8)
+            make.left.equalTo(10)
+            make.right.equalTo(leftBtn.snp.left).offset(-10)
+            make.height.equalTo(46)
+        }
         leftBtn.snp.makeConstraints { make in
             make.top.equalTo(8)
-            make.left.equalTo(16)
-            make.width.equalTo(rightBtn)
+            make.width.equalTo(94)
             make.right.equalTo(rightBtn.snp.left).offset(-10)
             make.height.equalTo(46)
         }
@@ -115,7 +121,9 @@ class YHImproveSchemeViewController: YHBaseViewController {
             make.top.equalTo(8)
             make.right.equalTo(-16)
             make.height.equalTo(46)
+            make.width.equalTo(158)
         }
+        
         return view
     }()
     
@@ -154,6 +162,34 @@ class YHImproveSchemeViewController: YHBaseViewController {
         return btn
     }()
     
+    lazy var saveBtn: UIButton = {
+        let btn = UIButton(type: .custom)
+        btn.addTarget(self, action: #selector(clickSaveBtn), for: .touchUpInside)
+
+        let imgV = UIImageView()
+        imgV.image = UIImage(named: "my_scheme_improve_save")
+        btn.addSubview(imgV)
+        
+        let label = UILabel()
+        label.font = UIFont.PFSC_R(ofSize: 11)
+        label.textColor = .mainTextColor
+        label.text = "保存至手机"
+        label.textAlignment = .center
+        btn.addSubview(label)
+        
+        imgV.snp.makeConstraints { make in
+            make.width.height.equalTo(24)
+            make.centerX.equalToSuperview()
+            make.bottom.equalTo(btn.snp.centerY).offset(5)
+        }
+        label.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(imgV.snp.bottom)
+            make.height.equalTo(15)
+        }
+        return btn
+    }()
+    
     @objc func didLeftBtnClicked() {
         self.modifyInfo()
     }
@@ -185,6 +221,7 @@ class YHImproveSchemeViewController: YHBaseViewController {
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(isPass ? 0.0 : 64+k_Height_safeAreaInsetsBottom())
         }
+    
         view.bringSubviewToFront(gk_navigationBar)
         tableView.reloadData()
         tableView.isHidden = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -49,7 +49,6 @@ class YHEducationInfoListVC: YHBaseViewController {
     
     var bottomView: YHSaveAndSubmitView = {
         let view = YHSaveAndSubmitView.createView()
-        view.isHiddenSave = true
         return view
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -49,7 +49,8 @@ class YHQualificationDetailVC: YHBaseViewController {
     
     var bottomView: YHSaveAndSubmitView = {
         let view = YHSaveAndSubmitView.createView()
-        view.changeRightBtnTitle("下一步".local)
+        view.isHiddenSave = true
+        view.changeRightBtnTitle("提交".local)
         return view
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -171,12 +171,12 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
         if let sponse = familyMemberInfo?.spouse {
             // 信息未填写时服务器返回的relation=0
             sponse.relationType = .spouse
-            let sponseArray:[YHFormItemProtocol] = [YHFormTitleItem(type: .sponse), sponse]
+            let sponseArray:[YHFormItemProtocol] = [YHFormTitleItem(type: .A), sponse]
             items.append(sponseArray)
         }
         
         // 子女section
-        var childArr:[YHFormItemProtocol] = [YHFormTitleItem(type: .child), YHFormAddItem(type: .addChild)]
+        var childArr:[YHFormItemProtocol] = [YHFormTitleItem(type: .C), YHFormAddItem(type: .addChild)]
         if let childs = familyMemberInfo?.child, !childs.isEmpty {
             childArr.insert(contentsOf: childs, at:1)
         }
@@ -345,10 +345,10 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
            
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)
-            if formItem.type == .child {
+            if formItem.type == .C {
                 cell.showEditType(type: isChildsEditMode)
                 
-            } else if formItem.type == .brother {
+            } else if formItem.type == .D {
                 cell.showEditType(type: isBrothersEditMode)
             }
             
@@ -356,7 +356,7 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
             cell.rightClickBlock = { [weak self] type in
                 
                 guard let self = self else { return }
-                if formItem.type == .child {
+                if formItem.type == .C {
                     if self.isChildsEditMode == .canCancel {
                         self.isChildsEditMode = .canEdit
                         
@@ -364,7 +364,7 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
                         self.isChildsEditMode = .canCancel
                     }
                 }
-                if formItem.type == .brother {
+                if formItem.type == .D {
                     if self.isBrothersEditMode == .canCancel {
                         self.isBrothersEditMode = .canEdit
                         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -18,14 +18,10 @@ protocol YHFormItemProtocol {
 // 表单标题类型
 enum YHFormTitleItemType:Int, CaseIterable {
     
-    // 配偶
-    case sponse = 1
-    // 父母
-    case parent
-    // 子女
-    case child
-    // 兄弟姐妹
-    case brother
+    case A = 1
+    case B
+    case C
+    case D
     
     // 随行
     case accompany
@@ -33,7 +29,6 @@ enum YHFormTitleItemType:Int, CaseIterable {
     case nationality
     // 居住信息
     case liveInfo
-    // 港澳通信证
     case hkAndMacaoPassport
     
     // 中国身份证
@@ -254,13 +249,13 @@ class YHFormTitleItem : YHFormItemProtocol {
     
     func getTitle() -> String {
         switch self.type {
-        case .sponse:
+        case .A:
             return "配偶".local
-        case .parent:
+        case .B:
             return "父母".local
-        case .brother:
+        case .D:
             return "兄弟姐妹".local
-        case .child:
+        case .C:
             return "子女".local
         case .accompany:
             return "随行".local
@@ -308,13 +303,13 @@ class YHFormTitleItem : YHFormItemProtocol {
     
     func getSubTitle() -> String {
         switch self.type {
-        case .sponse:
+        case .A:
             return "".local
-        case .parent:
+        case .B:
             return String(format: " (%@)", "包含已故".local)
-        case .brother:
+        case .D:
             return String(format: " (%@)", "如无可不填".local)
-        case .child:
+        case .C:
             return String(format: " (%@)", "如无可不填".local)
         case .mainApplicantEducation:
             return "（请从本科开始填写）".local

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift

@@ -166,12 +166,12 @@ class YHGCFamilyMemberInfoListVC: YHBaseViewController {
         if let sponse = familyMemberInfo?.spouse {
             // 信息未填写时服务器返回的relation=0
             sponse.relationType = .spouse
-            let sponseArray:[YHFormItemProtocol] = [YHFormTitleItem(type: .sponse), sponse]
+            let sponseArray:[YHFormItemProtocol] = [YHFormTitleItem(type: .A), sponse]
             items.append(sponseArray)
         }
         
         // 子女section
-        var childArr:[YHFormItemProtocol] = [YHFormTitleItem(type: .child), YHFormAddItem(type: .addChild)]
+        var childArr:[YHFormItemProtocol] = [YHFormTitleItem(type: .C), YHFormAddItem(type: .addChild)]
         if let childs = familyMemberInfo?.child, !childs.isEmpty {
             childArr.insert(contentsOf: childs, at:1)
         }
@@ -342,10 +342,10 @@ extension YHGCFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSourc
            
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)
-            if formItem.type == .child {
+            if formItem.type == .C {
                 cell.showEditType(type: isChildsEditMode)
                 
-            } else if formItem.type == .brother {
+            } else if formItem.type == .D {
                 cell.showEditType(type: isBrothersEditMode)
             }
             
@@ -353,7 +353,7 @@ extension YHGCFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSourc
             cell.rightClickBlock = { [weak self] type in
                 
                 guard let self = self else { return }
-                if formItem.type == .child {
+                if formItem.type == .C {
                     if self.isChildsEditMode == .canCancel {
                         self.isChildsEditMode = .canEdit
                         
@@ -361,7 +361,7 @@ extension YHGCFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSourc
                         self.isChildsEditMode = .canCancel
                     }
                 }
-                if formItem.type == .brother {
+                if formItem.type == .D {
                     if self.isBrothersEditMode == .canCancel {
                         self.isBrothersEditMode = .canEdit
                         

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -40,6 +40,21 @@ extension YHJsApi {
         }
     }
     
+    // 31、H5调用原生方法预览文件
+    @objc func goPreviewFile(_ url: String) {
+        DispatchQueue.main.async {
+            let viewModel = YHBaseViewModel()
+            viewModel.getPublicImageUrl(url) { success, error in
+                YHHUD.hide()
+                if let success = success {
+                    let tool = YHFilePreviewTool(targetVC: UIViewController.current)
+                    tool.openXLSXRemoteFile(urlString: success, fileName: "")
+                }
+            }
+            
+        }
+    }
+    
     
     // 30、跳转到APP底部的服务Tab-再推出服务进度页面
     @objc func goServiceProgressPage(_ tag : Any) {
@@ -710,20 +725,6 @@ extension YHJsApi {
         }
     }
     
-    @objc func goPreviewFile(_ url: String) {
-        DispatchQueue.main.async {
-            let viewModel = YHBaseViewModel()
-            viewModel.getPublicImageUrl(url) { success, error in
-                YHHUD.hide()
-                if let success = success {
-                    let tool = YHFilePreviewTool(targetVC: UIViewController.current)
-                    tool.openXLSXRemoteFile(urlString: success, fileName: "")
-                }
-            }
-            
-        }
-    }
-    
     @objc func goServiceByOrderId(_ tag: String) {
         DispatchQueue.main.async {
             UIViewController.current?.navigationController?.popToRootViewController(animated: false)

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的方案(新)/my_scheme_improve_save.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "下保存图片@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "下保存图片@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}