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:
  // 默认字段
  // 家庭成员
  点击预览
  // 未填项检测

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -80,6 +80,7 @@
 		046975122B96C77000A0CB66 /* YHClipperButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 046975112B96C77000A0CB66 /* YHClipperButton.swift */; };
 		046975162B96EB2200A0CB66 /* YHImageResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 046975152B96EB2200A0CB66 /* YHImageResultViewController.swift */; };
 		046975182B96EEB200A0CB66 /* YHResultBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 046975172B96EEB200A0CB66 /* YHResultBottomView.swift */; };
+		047294E82B988A19008E0B84 /* YHNewWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047294E72B988A19008E0B84 /* YHNewWebViewController.swift */; };
 		04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */; };
 		04808C062B4686510056D53C /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04808C042B4686510056D53C /* ATAuthSDK.bundle */; };
 		04808C082B4686C10056D53C /* ATAuthSDK_D.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 04808C032B4686510056D53C /* ATAuthSDK_D.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -398,6 +399,7 @@
 		046975112B96C77000A0CB66 /* YHClipperButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHClipperButton.swift; sourceTree = "<group>"; };
 		046975152B96EB2200A0CB66 /* YHImageResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHImageResultViewController.swift; sourceTree = "<group>"; };
 		046975172B96EEB200A0CB66 /* YHResultBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResultBottomView.swift; sourceTree = "<group>"; };
+		047294E72B988A19008E0B84 /* YHNewWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNewWebViewController.swift; sourceTree = "<group>"; };
 		04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = "<group>"; };
 		04808C032B4686510056D53C /* ATAuthSDK_D.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK_D.framework; sourceTree = "<group>"; };
 		04808C042B4686510056D53C /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
@@ -1322,6 +1324,7 @@
 				04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */,
 				04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */,
 				04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */,
+				047294E72B988A19008E0B84 /* YHNewWebViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -2099,6 +2102,7 @@
 				04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */,
 				04E86E492B8445F400A35F4B /* YHWorkActionView.swift in Sources */,
 				A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */,
+				047294E82B988A19008E0B84 /* YHNewWebViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift

@@ -401,6 +401,10 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         printLog("点击了 tableView Cell \(indexPath.row)")
+        let vc = YHWebViewViewController()
+        vc.url = "https://cloudapi.qiyuesuo.cn/contract/share/3202449385770287813?openPageToken=dd333ac2-88cd-40f8-b985-dc00c7c2f90a"
+        self.navigationController?.pushViewController(vc)
+//    https://cloudapi.qiyuesuo.cn/contract/share/3202449385770287813?openPageToken=d004e5af-aab9-43e4-b813-c5a6a8c16497
     }
 }
 

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

@@ -130,21 +130,21 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
     // 检查填写信息完整性
     func checkIntegrity() -> Bool {
         
-        if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber > 0 {
+        if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber != 0 {
           return false
         }
         
-        if let father = familyMemberInfo?.father, father.notFillNumber > 0 {
+        if let father = familyMemberInfo?.father, father.notFillNumber != 0 {
             return false
         }
             
-        if let mother = familyMemberInfo?.mother, mother.notFillNumber > 0 {
+        if let mother = familyMemberInfo?.mother, mother.notFillNumber != 0 {
             return false
         }
         
         if let childs = familyMemberInfo?.child, !childs.isEmpty {
             for child in childs {
-                if child.notFillNumber > 0 {
+                if child.notFillNumber != 0 {
                     return false
                 }
             }
@@ -152,7 +152,7 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
         
         if let brothers = familyMemberInfo?.brother, !brothers.isEmpty {
             for brother in brothers {
-                if brother.notFillNumber > 0 {
+                if brother.notFillNumber != 0 {
                     return false
                 }
             }

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

@@ -550,7 +550,23 @@ class YHFamilyMemberGroupInfo: SmartCodable {
         case brother = "brother"
         case child = "child"
     }
-
+    
+    func checkDefaultValue() -> Self {
+        _ = father?.checkDefaultValue()
+        _ = mother?.checkDefaultValue()
+        _ = spouse?.checkDefaultValue()
+        if let child = child {
+            for item in child {
+                _ = item.checkDefaultValue()
+            }
+        }
+        if let brother = brother {
+            for item in brother {
+                _ = item.checkDefaultValue()
+            }
+        }
+        return self
+    }
     required init() {
         
     }
@@ -900,20 +916,24 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var occupation: String = ""
     var occupationName: String = ""
     var operatorName: String = ""
+    // 是否办理过香港身份证
     var childHasHkId: YHChildStepchildClass = YHChildStepchildClass()
     var hkIdentityCard: String?
     var sex: Int = 0
     var married: String = ""
     var nows: Int = 0
     var address: YHAddress = YHAddress()
+    // 是否前一次婚姻子女
     var childStepchild: YHChildStepchildClass = YHChildStepchildClass()
-    var childInHk: YHChildStepchildClass = YHChildStepchildClass()
+    // // 目前是否在港
+    var childInHk: YHChildStepchildClass = YHChildStepchildClass(has:"N")
     var countryIdentity: YHChildStepchildClass = YHChildStepchildClass()
     var hkIdentity: String = ""
     var liveCountry: String = ""
     var finishFollow: Int = 0
     var step: Int = 0
     var isHandled: Int = 0
+    // notFillNumber = -1 表示还没开始填写任意数据项
     var notFillNumber: Int = -1
     var certificates: YHCertificates = YHCertificates()
     var usedName: String = ""
@@ -922,6 +942,22 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var isInHk: Int = 0
     var isLiveOverseaYear: Int = 0
     var surname: String = ""
+    
+    func checkDefaultValue() -> Self {
+        if hasDegree.isEmpty {
+            hasDegree = "0"
+        }
+        if childHasHkId.has.isEmpty {
+            childHasHkId.has = "N"
+        }
+        if childStepchild.has.isEmpty {
+            childStepchild.has = "N"
+        }
+        if childInHk.has.isEmpty {
+            childInHk.has = "N"
+        }
+        return self
+    }
 
     enum CodingKeys: String, CodingKey {
         case id = "id"
@@ -1274,6 +1310,13 @@ class YHChildStepchildClass: SmartCodable {
     required init() {
         
     }
+    
+    init(has:String = "", info:String = "", year:String = "", month:String = "") {
+        self.has = has
+        self.info = info
+        self.year = year
+        self.month = month
+    }
 }
 
 // MARK: - YHSubsetNamePinyin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -32,7 +32,7 @@ class YHFamilyRequestViewModel {
                 callBackBlock(false,nil)
                 return
             }
-            familyInfo = resultModel
+            familyInfo = resultModel.checkDefaultValue()
             callBackBlock(true,nil)
             
         } failBlock: { err in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -379,6 +379,10 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                                     return
                                 }
                             }
+                        } else {
+                            let vc = YHImageViewController()
+                            vc.imgString = model.fileUrl
+                            UIViewController.current?.navigationController?.pushViewController(vc)
                         }
                     }
                     return cell

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/ViewModel/YHCompanyViewModel.swift

@@ -29,11 +29,9 @@ class YHCompanyViewModel: YHBaseViewModel {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
                 callBackBlock([], error)
             }
-            
         } failBlock: { err in
             callBackBlock([],err)
         }
-
     }
 }
 

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHNewWebViewController.swift

+//
+//  YHNewWebViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/3/6.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import WebKit
+
+class YHNewWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationDelegate  {
+
+    var webview = WKWebView()
+    var progBar = UIProgressView()
+    var url = "https://www.baidu.com"
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navBackgroundColor = .clear
+        gk_navShadowColor = .clear
+        gk_navigationBar.isHidden = true
+        // 创建wkwebview
+        webview = WKWebView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height))
+                
+        webview.navigationDelegate = self
+        // 创建网址
+        let url = NSURL(string: url)
+        // 创建请求
+        let request = NSURLRequest(url: url! as URL)
+        // 加载请求
+        webview.load(request as URLRequest)
+        // 添加wkwebview
+        self.view.addSubview(webview)
+        
+//        // 加载网页的进度条
+//        progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30))
+//        progBar.progress = 0.0
+//        progBar.tintColor = UIColor.brandMainColor
+//        webview.addSubview(progBar)
+//        // 监听网页加载的进度
+//        webview.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
+        
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+//        webview.removeObserver(self, forKeyPath: "estimatedProgress")
+    }
+    
+    // MARK: - WKNavigationDelegate
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        self.navigationItem.title = webview.title
+    }
+    
+    // MARK: - WKUIDelegate
+    
+    func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
+        // 实现非安全链接的跳转。如果目标主视图不为空,则允许导航
+        if !(navigationAction.targetFrame?.isMainFrame != nil) {
+            webview.load(navigationAction.request)
+        }
+        return nil
+    }
+    
+    func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
+        // 修复弹窗弹出的问题
+        let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: { (_) -> Void in
+            completionHandler()
+        }))
+        self.present(alert, animated: true, completion: nil)
+    }
+    
+    // MARK: - webview function
+    
+    @objc func toBack() {
+        if webview.canGoBack {
+            webview.goBack()
+        }
+    }
+     
+    @objc func toForward() {
+        if webview.canGoForward {
+            webview.goForward()
+        }
+    }
+    
+    // MARK: - KVO
+
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        if keyPath == "estimatedProgress" {
+            self.progBar.alpha = 1.0
+            progBar.setProgress(Float(webview.estimatedProgress), animated: true)
+             //进度条的值最大为1.0
+            if(self.webview.estimatedProgress >= 1.0) {
+                UIView.animate(withDuration: 0.3, delay: 0.1, options: .curveEaseInOut, animations: { () -> Void in
+                    self.progBar.alpha = 0.0
+                }, completion: { (finished:Bool) -> Void in
+                    self.progBar.progress = 0
+                })
+            }
+        }
+    }
+    
+    override class func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        
+    }
+}