Merge commit 'cd1ef10b' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1428,8 +1428,6 @@
 				0493B3DB2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift */,
 				0477E17B2BA4238400436346 /* YHMaterialListViewController.swift */,
 				A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */,
-				A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */,
-				A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */,
 				A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */,
 			);
 			path = C;
@@ -1505,6 +1503,38 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		A525D22A2BA836D6001A84F5 /* MyScheme(我的方案) */ = {
+			isa = PBXGroup;
+			children = (
+				A525D22B2BA8370F001A84F5 /* C */,
+			);
+			path = "MyScheme(我的方案)";
+			sourceTree = "<group>";
+		};
+		A525D22B2BA8370F001A84F5 /* C */ = {
+			isa = PBXGroup;
+			children = (
+				A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		A525D22C2BA837C5001A84F5 /* FileList(文件清单) */ = {
+			isa = PBXGroup;
+			children = (
+				A525D22D2BA837DF001A84F5 /* C */,
+			);
+			path = "FileList(文件清单)";
+			sourceTree = "<group>";
+		};
+		A525D22D2BA837DF001A84F5 /* C */ = {
+			isa = PBXGroup;
+			children = (
+				A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
 		A5573EC52B317BFF00D98EC0 = {
 			isa = PBXGroup;
 			children = (
@@ -1747,6 +1777,8 @@
 		A5ACE9162B4564F7002C94D2 /* IntelligentService(服务中心) */ = {
 			isa = PBXGroup;
 			children = (
+				A525D22C2BA837C5001A84F5 /* FileList(文件清单) */,
+				A525D22A2BA836D6001A84F5 /* MyScheme(我的方案) */,
 				045EEE1B2B9F171A0022A143 /* MySignature(我的签字) */,
 				045EEDFB2B9F171A0022A143 /* MyScore(我的评分) */,
 				045EEDF82B9F171A0022A143 /* MyDocuments(我的文书) */,

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

+//
+//  YHFileListViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/17.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+/*
+ 文件清单
+ */
+
+class YHFileListViewController: YHBaseViewController {
+    
+    var orderId : Int?
+    private let certificateReqVM : YHCertificateViewModel = YHCertificateViewModel()
+    
+    private lazy var topBkg : UIView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "file_list_bkg")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+        
+    }()
+    
+    
+    let bottomView : YHCertificateEntryBottomView = YHCertificateEntryBottomView()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        loadData()
+    }
+}
+
+extension YHFileListViewController {
+    func loadData() {
+//        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+//            let param = ["order_id":orderID,"node":"1","state":"1"]
+//            certificateReqVM.getCertificateStatisticData(params: param) { success, error in
+//                if success == true {
+//                    self.headerView.dataModel = self.certificateReqVM.certificateEntryModel
+//                } else {
+//                    YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+//                }
+//                
+//                self.homeTableView.reloadData()
+//            }
+//        } else {
+//            printLog("error : orderID 为空")
+//        }
+    }
+    
+    func setupUI() {
+        gk_navTitle = "文件清单"
+        gk_navBarAlpha = 1.0
+        gk_navBackgroundColor = .white
+        
+        view.addSubview(topBkg)
+        topBkg.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(312)
+        }
+        
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(YHCertificateEntryBottomView.viewH)
+        }
+    }
+}

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

@@ -66,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
     }
     
@@ -76,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)
     }

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

-//
-//  YHFileListVC.swift
-//  galaxy
-//
-//  Created by davidhuangA on 2024/3/17.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-/*
- 文件清单
- */
-
-class YHFileListViewController: YHBaseViewController {
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        // Do any additional setup after loading the view.
-    }
-
-}

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

@@ -108,9 +108,9 @@ extension YHMineCertificateEntryViewController {
                 
             } else {
                 //生成清单
-                
+                let vc = YHFileListViewController()
+                self.navigationController?.pushViewController(vc)
             }
-            
         }
     }
 }

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/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/清单列表/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "编组 20备份 2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "编组 20备份 2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_icon.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
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_wenzi.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
+  }
+}