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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 我的证书
  部分UI bug修改
  // 我的证件

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateResourceUploadVC.swift

@@ -14,7 +14,7 @@ import IQKeyboardManagerSwift
 class YHCertificateResourceUploadVC: YHBaseViewController {
 
     var orderId : Int?
-    var items:[String] = ["1", "2", "2", "2", "2", "2", "2", "2"]
+    var items:[YHSupplementInfo] = []
     var viewModel: YHCertificateViewModel = YHCertificateViewModel()
 
     lazy var tableView: UITableView = {
@@ -41,6 +41,7 @@ class YHCertificateResourceUploadVC: YHBaseViewController {
         self.view.backgroundColor = .white
         self.gk_navigationBar.isHidden = true
         createUI()
+        requestList()
     }
     
     func createUI() {
@@ -65,7 +66,8 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let item = items[indexPath.section]
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath)
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath) as! YHCertificateInfoCell
+        cell.updateModel(item)
         return cell
     }
     
@@ -75,26 +77,6 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-//        if true {
-//            
-//            selectUploadFileFromICouldDrive()
-//            return
-//        }
-        
-        if true {
-            
-            YHCertificateUploadSheetView.sheetView.show {
-               [weak self] actionType in
-               guard let self = self else { return }
-               print("%d", actionType.rawValue)
-            }
-            return 
-        }
-                
-        YHCertificateFilterView.sheetView.show()
-        return
-        
-        print("ZZZ")
         let vc = YHUploadContentVC()
         self.navigationController?.pushViewController(vc)
     }
@@ -132,18 +114,23 @@ extension YHCertificateResourceUploadVC {
         let params = [
                         "order_id" : orderId ?? 0,
                         "node": "1",
-                        "state": "",
-                        "category_id": "",
+                        "state": "1",
+                        "category_id": "20",
                         "status_all": "",
                         "keywork": "",
                         "template_cate_id": "",
                         "supplement_ids": []] as [String: Any]
+        // state: 3:待上传 2:已驳回 1:已通过 0:审核中
         viewModel.getCertificateList(params: params) {
             
-            listInfo, error in
+            [weak self] listInfo, error in
+            guard let self = self else { return }
             
+            items.removeAll()
             if let listInfo = listInfo {
                 let arr = listInfo.supplementList
+                items.append(contentsOf: arr)
+                self.tableView.reloadData()
             }
             
             if let errorMsg = error?.errorMsg, errorMsg.count > 0 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHUploadContentVC.swift

@@ -11,6 +11,9 @@ import IQKeyboardManagerSwift
 
 class YHUploadContentVC: YHBaseViewController {
     
+    var orderId : Int?
+    var viewModel: YHCertificateViewModel = YHCertificateViewModel()
+    
     var items:[String] = ["1", "2", "2", "2", "2", "2", "2", "2"]
     
     var renameInputView: YHFileRenameInputView = {
@@ -270,3 +273,37 @@ extension YHUploadContentVC {
         }
     }
 }
+
+extension YHUploadContentVC {
+    
+    func requestList() {
+        
+        let params = [
+                        "order_id" : orderId ?? 0,
+                        "node": "1",
+                        "state": "1",
+                        "category_id": "20",
+                        "status_all": "",
+                        "keywork": "",
+                        "template_cate_id": "",
+                        "supplement_ids": []] as [String: Any]
+        // state: 3:待上传 2:已驳回 1:已通过 0:审核中
+        viewModel.getCertificateList(params: params) {
+            
+            [weak self] listInfo, error in
+            guard let self = self else { return }
+            
+//            items.removeAll()
+//            if let listInfo = listInfo {
+//                let arr = listInfo.supplementList
+//                items.append(contentsOf: arr)
+//                self.tableView.reloadData()
+//            }
+//            
+//            if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
+//                YHHUD.flash(message: errorMsg, duration:3)
+//            }
+        }
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateInfoCell.swift

@@ -65,6 +65,22 @@ class YHCertificateInfoCell: UITableViewCell {
         }
     }
     
+    func updateModel(_ model: YHSupplementInfo) {
+        
+        if model.templateInfo.materialPath.isEmpty {
+            
+            nameTextView.attributed.text = """
+            \(model.name, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_M(ofSize: 16)))
+            """
+            
+        } else {
+            nameTextView.attributed.text = """
+            \(model.name, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_M(ofSize: 16)))  \(.view(templateLabel, .original(.center)))
+            """
+        }
+        infoLabel.text = "类型: \(model.typeName) 所属人: \(model.nameExtra.userName)"
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/C/YHMineSchemeViewController.swift

@@ -16,8 +16,12 @@ class YHMineSchemeViewController: YHBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        // Do any additional setup after loading the view.
+        gk_navBackgroundImage = UIImage(named: "my_scheme_nav")
+        gk_darkNavBackgroundImage = UIImage(named: "my_scheme_nav")
+        gk_navShadowImage = UIImage(named: "my_scheme_nav")
+        gk_darkNavShadowImage = UIImage(named: "my_scheme_nav")
+        gk_backImage = UIImage(named: "my_scheme_nav")
+        gk_darkBackImage = UIImage(named: "my_scheme_nav")
     }
     
 

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

@@ -559,6 +559,7 @@ extension YHEducationDetailVC {
         
         guard var dict:[String:Any] = detailInfo.toDictionary() else { return }
         dict["order_id"] = self.orderId
+        dict["is_aboard_school"] = detailInfo.isSchoolInAboard()
     
         self.educationRequest.saveEducationInfo(params: dict, isSilent: !isShowToast) {
             [weak self] success, error in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHAddressPicker/YHAddressPickView.swift

@@ -125,7 +125,7 @@ class YHAddressPickView: UIView {
         return button
     }()
     private let leftLabel: UILabel = {
-        let label = UILabel(frame: CGRect(x: 24, y: 52, width: 100, height: 18))
+        let label = UILabel(frame: CGRect(x: 24, y: 62, width: 100, height: 18))
         label.text = "已选择"
         label.textColor = UIColor.mainTextColor
         label.font = UIFont.PFSC_M(ofSize: 14)
@@ -158,7 +158,7 @@ class YHAddressPickView: UIView {
     private var titleSV: UIScrollView!
     /// titleSV上button下的滚动线
 //    private var underLine = UIView()
-    private var tableView = UITableView(frame: CGRect(x: 0, y:52 , width: UIScreen.main.bounds.width, height: 526))
+    private var tableView = UITableView(frame: CGRect(x: 0, y:62 , width: UIScreen.main.bounds.width, height: 526))
 
     init(frame: CGRect, selectColor: UIColor, selectedProvince: String? = nil, selectedCity: String? = nil) {
         self.selectColor = selectColor
@@ -176,6 +176,18 @@ class YHAddressPickView: UIView {
         buildTitleScrollView()
         drawTableView()
         self.addSubview(titleLabel)
+        let lineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.top.equalTo(52)
+            make.height.equalTo(1)
+            make.right.equalTo(-21)
+        }
         self.addSubview(rightCancelButton)
         rightCancelButton.addTarget(self, action: #selector(onClickCancelButton), for: .touchUpInside)
         self.addSubview(leftLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHCardExampleView.swift

@@ -80,6 +80,7 @@ class YHCardExampleView: UIView {
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(21)
+            make.right.equalTo(-21)
             make.height.equalTo(21)
             make.top.equalTo(16)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHImagePickerView.swift

@@ -54,7 +54,7 @@ class YHImagePickerView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 16
+            view.layer.cornerRadius = kCornerRadius8
             return view
         }()
         addSubview(centerView)
@@ -68,7 +68,7 @@ class YHImagePickerView: UIView {
             label.text = "请选择上传方式"
             label.font = UIFont.PFSC_M(ofSize: 17)
             label.textColor = UIColor.mainTextColor
-            label.textAlignment = .left
+            label.textAlignment = .center
             return label
         }()
         centerView.addSubview(titleLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -486,6 +486,12 @@ extension YHItemView: UITextFieldDelegate {
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         
         if string.isEmpty == true {
+            var newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+            var data = dataSource ?? YHItemModel()
+            data.message = newText
+            if let block = block {
+                block(data)
+            }
             return true
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -109,7 +109,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let section = YHSectionItemModel(title: "主申请人信息", models: [item, item1, item2, item3, item4, item555, item6, item7])
         
         let item8 = YHItemModel(id: .id29, isNeed: true, title: "手机号码", isUserKeyBoard: true, prompts: "请输入", message: mainModel.mobile, isShowPrompts: isShowPrompt, alertMessage:"请输入手机号码")
-        let item9 = YHItemModel(id: .id30, isNeed: false, title: "电子邮箱", isUserKeyBoard: true, prompts: "请输入", message: mainModel.email, isShowPrompts: isShowPrompt, alertMessage:"请输入电子邮箱")
+        let item9 = YHItemModel(id: .id30, isNeed: false, title: "电子邮箱", isUserKeyBoard: true, prompts: "请输入", message: mainModel.email, isShowPrompts: isShowPrompt, alertMessage:"")
         let section1 = YHSectionItemModel(title: "联系方式", models: [item8, item9])
         
         let item10 = YHItemModel(id: .id31, isNeed: true, title: "是否办理过", isUserKeyBoard: false, prompts: nil, message: "\(mainModel.has_hk_id )", leftButtonString: "是", rightButtonString: "否", isShowPrompts: isShowPrompt, alertMessage:"请选择")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHImageResultViewController.swift

@@ -42,7 +42,7 @@ class YHImageResultViewController: YHBaseViewController {
             let bottom = YHResultBottomView()
             bottom.nextblock = {[weak self] in
                 guard let self = self else { return }
-                YHHUD.show(.progress(message: ""))
+                YHHUD.show(.progress(message: "识别中…"))
                 self.viewModel.uploadImage(self.img) {[weak self] success, error in
                     guard let self = self else { return }
                     guard let url = success else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -477,6 +477,12 @@ extension YHWorkExperienceItemView: UITextFieldDelegate {
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         
         if string.isEmpty == true {
+            let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+            var data = dataSource ?? YHWorkExperienceModel()
+            data.message = newText
+            if let block = block {
+                block(data)
+            }
             return true
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -173,14 +173,14 @@ extension YHServiceCenterMainViewModel {
                         arrContactStausItmes.append(model5)
 //                    }
                     
-                    if resultModel.scheme_position_switch == 1 {
+//                    if resultModel.scheme_position_switch == 1 {
                         //我的方案
-                        let model5 = YHContactMainItemStatusModel()
-                        model5.type = 6
-                        model5.isFinished = true
-                        arrContactStausItmes.append(model5)
+                        let model6 = YHContactMainItemStatusModel()
+                        model6.type = 6
+                        model6.isFinished = true
+                        arrContactStausItmes.append(model6)
                         
-                    }
+//                    }
                 } else {
                     
                     let model = YHContactMainItemStatusModel()

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -160,22 +160,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         
         if (indexPath.row >= items.count) { return }
         
-        if true {
-            
-//            YHCertificateUploadFailTipsView.tipsView().show()
-
-            
-//            let vc = YHUploadContentVC()
-//            self.navigationController?.pushViewController(vc)
-            
-            
-           let vc = YHMaterialListViewController()
-           self.navigationController?.pushViewController(vc)
-           return
-        }
-        
-        
-        
         if !checkLogin() {
             let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
             vc.modalPresentationStyle = .custom

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的评分/my_scheme_nav.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "my_scheme_nav.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}