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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -261,6 +261,7 @@
 		A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A58951C42B398D1000225C19 /* Launch Screen.storyboard */; };
 		A58A8C8F2BA6978100632765 /* YHMineCertificateEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */; };
 		A58A8C942BA6C7C600632765 /* YHCertificateEntryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58A8C932BA6C7C600632765 /* YHCertificateEntryModel.swift */; };
+		A58AC09D2BABD59600A30FA9 /* YHFileListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58AC09C2BABD59600A30FA9 /* YHFileListModel.swift */; };
 		A592BFEF2B9AB720004C04A9 /* YHWholeScreenTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592BFEE2B9AB720004C04A9 /* YHWholeScreenTipsView.swift */; };
 		A592FE912BA6CC010062FACA /* YHCertificateEntryHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE902BA6CC010062FACA /* YHCertificateEntryHeadView.swift */; };
 		A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */; };
@@ -645,6 +646,7 @@
 		A58951C42B398D1000225C19 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineCertificateEntryViewController.swift; sourceTree = "<group>"; };
 		A58A8C932BA6C7C600632765 /* YHCertificateEntryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryModel.swift; sourceTree = "<group>"; };
+		A58AC09C2BABD59600A30FA9 /* YHFileListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListModel.swift; sourceTree = "<group>"; };
 		A592BFEE2B9AB720004C04A9 /* YHWholeScreenTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWholeScreenTipsView.swift; sourceTree = "<group>"; };
 		A592FE902BA6CC010062FACA /* YHCertificateEntryHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryHeadView.swift; sourceTree = "<group>"; };
 		A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryBottomView.swift; sourceTree = "<group>"; };
@@ -1574,6 +1576,7 @@
 		A525D22C2BA837C5001A84F5 /* FileList(文件清单) */ = {
 			isa = PBXGroup;
 			children = (
+				A58AC09B2BABD57300A30FA9 /* M */,
 				A5D001262BABC84A001F003C /* V */,
 				A525D22D2BA837DF001A84F5 /* C */,
 			);
@@ -1647,6 +1650,14 @@
 			path = VM;
 			sourceTree = "<group>";
 		};
+		A58AC09B2BABD57300A30FA9 /* M */ = {
+			isa = PBXGroup;
+			children = (
+				A58AC09C2BABD59600A30FA9 /* YHFileListModel.swift */,
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
 		A5ACE8D72B4564F7002C94D2 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
@@ -2224,6 +2235,7 @@
 				049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */,
 				A5C5B3002B55623800A7C5D1 /* YHMainContentBaseViewController.swift in Sources */,
 				045EEF112B9F171A0022A143 /* YHMainInformationModel.swift in Sources */,
+				A58AC09D2BABD59600A30FA9 /* YHFileListModel.swift in Sources */,
 				045EEEFF2B9F171A0022A143 /* YHSaveAndSubmitView.swift in Sources */,
 				045EEF0E2B9F171A0022A143 /* YHBasicInfoFillView.swift in Sources */,
 				045EEEA12B9F171A0022A143 /* YHWorkExperienceDetailModel.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -91,8 +91,6 @@ extension YHFileListViewController {
             }
         }
         
-        
-        
         myScrollView.backgroundColor = UIColor(hex:0x0D37C7, alpha: 1.0)
         view.addSubview(myScrollView)
         myScrollView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/M/YHFileListModel.swift

+//
+//  YHFileListModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/21.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHFileListModel: SmartCodable {
+    var ApplicantName : String = ""
+    var category_id : Int = -1
+    var checks_tatus : Int = -1
+    var supplement_list : [YHFileListSubModel] = []
+    
+    required init() {
+    }
+}
+
+
+class YHFileListSubModel: SmartCodable {
+    var name : String = ""
+    var type_name : String = ""
+    var checks_tatus : Int = -1
+    
+    required init() {
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListContentView.swift

@@ -9,13 +9,22 @@
 import UIKit
 
 class YHFileListContentView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initView()
+    }
     
-    /*
-    // Only override draw() if you perform custom drawing.
-    // An empty implementation adversely affects performance during animation.
-    override func draw(_ rect: CGRect) {
-        // Drawing code
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
     }
-    */
+}
+
+
+private extension YHFileListContentView {
+    func initView() {
+//        let he
         
+        
+        
+    }
 }

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

@@ -37,6 +37,8 @@ class YHCertificateViewModel: YHBaseViewModel {
     var certificateEntryModel : YHCertificateEntryModel?
     var arrQuestionAndAnswer : [YHQuestionAndAnswerModel?] = []
     
+    var arrFileListData : [YHFileListModel?] = []
+    
     
     
     //我的证件  清单列表数据
@@ -51,21 +53,19 @@ class YHCertificateViewModel: YHBaseViewModel {
             
             if json.code == 200 {
                 let dic = json.data
-                guard let resultModel = YHCertificateEntryModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let resultModel = [YHFileListModel].deserialize(array: dic as? [Any]) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
                     return
                 }
-                self.certificateEntryModel = resultModel
+                self.arrFileListData = resultModel
                 callBackBlock(true,nil)
             } else {
                 
                 let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
                 callBackBlock(false,err)
-                
             }
-            
         } failBlock: { err in
             callBackBlock(false,err)
         }

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -23,12 +23,7 @@ extension YHLoginViewModel {
         let params: [String : Any] = ["type": "Phone",
                                       "value": phone,
                                       "extend":"register"]
-        
-//        let strUrl = "http://test-cuser.galaxy-immi.com/" + YHAllApiName.User.verifyCode
-        
-        let strUrl = "http://test-cuser.galaxy-immi.com/" + YHAllApiName.User.verifyCode
-
-//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.User.verifyCode
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.User.verifyCode
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
             guard let self = self else { return }
             

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -145,8 +145,8 @@ class YHAllApiName {
     //获取验证
     struct User {
 #if DEBUG
-        static let verifyCode = "user/verify-code"
-#else
+//        static let verifyCode = "user/verify-code"
+//#else
         static let verifyCode = "cuser/user/verify-code"
 #endif
         

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_head_bkg.imageset/Contents.json

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