处理 返回延迟的问题

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -261,6 +261,8 @@
 		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 */; };
+		A58AC09F2BAC05BA00A30FA9 /* YHFileListItemsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58AC09E2BAC05BA00A30FA9 /* YHFileListItemsView.swift */; };
+		A58AC0A12BAC0B2900A30FA9 /* YHFileListItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58AC0A02BAC0B2900A30FA9 /* YHFileListItemView.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 +647,8 @@
 		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>"; };
+		A58AC09E2BAC05BA00A30FA9 /* YHFileListItemsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListItemsView.swift; sourceTree = "<group>"; };
+		A58AC0A02BAC0B2900A30FA9 /* YHFileListItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListItemView.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>"; };
@@ -1997,6 +2001,8 @@
 				A520124E2BABCE05008655EA /* YHFileListContentView.swift */,
 				A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */,
 				A5D001292BABC84A001F003C /* YHFileListBottomView.swift */,
+				A58AC0A02BAC0B2900A30FA9 /* YHFileListItemView.swift */,
+				A58AC09E2BAC05BA00A30FA9 /* YHFileListItemsView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2295,6 +2301,7 @@
 				0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */,
 				0468D4282B50D4AF00CFB916 /* YHPrivacyAlertView.swift in Sources */,
 				045EEEB22B9F171A0022A143 /* YHWorkActionView.swift in Sources */,
+				A58AC09F2BAC05BA00A30FA9 /* YHFileListItemsView.swift in Sources */,
 				045EEE8C2B9F171A0022A143 /* YHPreviewMainViewController.swift in Sources */,
 				0468D4342B56587B00CFB916 /* YHOSSManager.swift in Sources */,
 				A5C382D12B5FAAB300C5E65C /* YHContactItemModel.swift in Sources */,
@@ -2403,6 +2410,7 @@
 				045EEF1B2B9F171A0022A143 /* YHAddressPickViewTableViewCell.swift in Sources */,
 				045EEE932B9F171A0022A143 /* YHPreviewInfoSingleLineTitleView.swift in Sources */,
 				045EEF1D2B9F171A0022A143 /* YHAddressPickView.swift in Sources */,
+				A58AC0A12BAC0B2900A30FA9 /* YHFileListItemView.swift in Sources */,
 				045EEED12B9F171A0022A143 /* YHScorePersonInfoCell.swift in Sources */,
 				045EEF0D2B9F171A0022A143 /* YHBasicInfoFillCell.swift in Sources */,
 				045EEEEC2B9F171A0022A143 /* YHBrotherInfoVC.swift in Sources */,
@@ -2695,7 +2703,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2715,7 +2723,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.2;
+				MARKETING_VERSION = 0.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2737,7 +2745,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2757,7 +2765,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.2;
+				MARKETING_VERSION = 0.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -33,7 +33,7 @@ class YHFileListViewController: YHBaseViewController {
     
     private lazy var myContentView : YHFileListContentView = {
         let view = YHFileListContentView()
-        view.backgroundColor = .yellow
+        view.backgroundColor = .white
         view.layer.cornerRadius = kCornerRadius6
         view.clipsToBounds = true
         return view
@@ -60,13 +60,11 @@ extension YHFileListViewController {
             let tttt = "11758" //for test hjl
             let param = ["order_id":tttt,"node":"1","state":"1"]
             certificateReqVM.getCertificateFileListData(params: param) { success, error in
-//                if success == true {
-//                    self.headerView.dataModel = self.certificateReqVM.certificateEntryModel
-//                } else {
-//                    YHHUD.flash(message: error?.errorMsg ?? "请求出错")
-//                }
-                
-//                self.homeTableView.reloadData()
+                if success == true {
+                    self.myContentView.dataModel = self.certificateReqVM.arrFileListData
+                } else {
+                    YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+                }
             }
         } else {
             printLog("error : orderID 为空")
@@ -110,7 +108,7 @@ extension YHFileListViewController {
             make.top.equalTo(217)
             make.left.equalTo(kMargin)
             make.width.equalTo(KScreenWidth - 2*kMargin)
-            make.height.equalTo(1700) //for test hjl
+//            make.height.equalTo(1700) //for test hjl
         }
         
         let footLable = UILabel()

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

@@ -17,14 +17,44 @@ class YHFileListContentView: UIView {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    
+    var dataModel : [YHFileListModel?]? {
+        didSet {
+            updataUI()
+        }
+    }
 }
 
 
 private extension YHFileListContentView {
     func initView() {
-//        let he
+        backgroundColor = .clear
+        
+       
+    }
+}
 
+extension YHFileListContentView {
+    func updataUI() {
         
+        guard let arrData = dataModel,arrData.count > 0 else { return }
         
+        let sessionBkgImageV : UIImageView = UIImageView(image: UIImage(named: "file_list_head_bkg"))
+        sessionBkgImageV.contentMode = .scaleAspectFill
+        
+        addSubview(sessionBkgImageV)
+        sessionBkgImageV.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(2)
+            make.left.equalToSuperview().offset(2)
+            make.right.equalToSuperview().offset(-2)
+            make.height.equalTo(70)
+            
+            make.bottom.equalToSuperview().offset(-20)
+        }
+        
+        
+        for (index,item) in arrData.enumerated() {
+            
+        }
     }
 }

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

+//
+//  YHFileListItemView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/21.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFileListItemView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    //index
+    private lazy var indexLable : UILabel = {
+        let lable0 = UILabel(text: "index")
+        lable0.textColor = UIColor.labelTextColor2
+        lable0.font = UIFont.PFSC_B(ofSize: 19)
+        return lable0
+    }()
+    
+    //title
+    private lazy var titleLable : UILabel = {
+        let lable0 = UILabel(text: "title")
+        lable0.textColor = UIColor.labelTextColor2
+        lable0.font = UIFont.PFSC_R(ofSize: 15)
+        return lable0
+    }()
+    
+    //subtitle
+    private lazy var subtitleLable : UILabel = {
+        let lable0 = UILabel(text: "subtitle")
+        lable0.textColor = UIColor.mainTextColor
+        lable0.font = UIFont.PFSC_R(ofSize: 12)
+        lable0.numberOfLines = 0
+        lable0.lineBreakMode = .byWordWrapping
+        lable0.textAlignment = .right
+        return lable0
+    }()
+    
+    //status
+    private lazy var statusLable : UILabel = {
+        let lable0 = UILabel(text: "状态")
+        lable0.textColor = UIColor.mainTextColor
+        lable0.font = UIFont.PFSC_R(ofSize: 12)
+        lable0.numberOfLines = 0
+        lable0.lineBreakMode = .byWordWrapping
+        lable0.textAlignment = .right
+        return lable0
+    }()
+    
+    //line
+    private lazy var line : UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+}
+
+private extension YHFileListItemView {
+    func initView() {
+        addSubview(indexLable)
+        indexLable.snp.makeConstraints { make in
+            make.left.equalTo(8)
+            make.width.equalTo(26)
+            make.centerY.equalToSuperview()
+        }
+        
+        addSubview(statusLable)
+        statusLable.snp.makeConstraints { make in
+            make.right.equalTo(-26)
+            make.centerY.equalToSuperview()
+            make.height.equalTo(18)
+        }
+        
+        
+        addSubview(titleLable)
+        titleLable.snp.makeConstraints { make in
+            make.top.equalTo(kMargin)
+            make.left.equalTo(40)
+            make.right.equalTo(statusLable.snp.left).offset(6)
+        }
+        
+        
+        addSubview(subtitleLable)
+        subtitleLable.snp.makeConstraints { make in
+            make.top.equalTo(titleLable.snp.bottom).offset(2)
+            make.left.equalTo(titleLable.snp.left)
+            make.right.equalTo(titleLable.snp.right)
+        }
+        
+        addSubview(line)
+        line.snp.makeConstraints { make in
+            make.top.equalTo(subtitleLable.snp.bottom).offset(kMargin)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(0.5)
+            make.bottom.equalToSuperview()
+        }
+    }
+}

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

+//
+//  YHFileListItems.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/21.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFileListItemsView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+    }
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var dataModel : YHFileListModel? {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    
+    
+}
+
+private extension YHFileListItemsView {
+    func updateUI() {
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift

@@ -84,9 +84,7 @@ extension YHBasicInfoFillViewController {
                 self.homeTableView.reloadData()
             } else {
                 YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
-                DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1.5) {[weak self] in
-                    self?.navigationController?.popViewController(animated: true)
-                }
+                self.navigationController?.popViewController(animated: true)
             }
             self.homeTableView.reloadData()
         }
@@ -226,10 +224,8 @@ extension YHBasicInfoFillViewController {
                 YHHUD.flash(message: title)
                 
                 if isSaveFlag == false {
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
                     self?.navigationController?.popViewController(animated: true)
                 }
-                }
             } else {
                 
                 let title = isSaveFlag ? "保存失败" : "提交失败"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift

@@ -126,9 +126,7 @@ extension YHOtherInfoFillViewController {
                     
                     YHHUD.flash(message:msg)
                     if flag == true {
-                        DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1.5) {[weak self] in
-                            self?.navigationController?.popViewController(animated: true)
-                        }
+                        self.navigationController?.popViewController(animated: true)
                     }
                 } else {
                     

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

@@ -16,6 +16,9 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
 //    var url = "https://www.baidu.com"
     var url = "https://upload-cdn.galaxy-immi.com/crm/production/1620271613711.pdf"
     
+//    var url = "https://upload-cdn.galaxy-immi.com/crm/development/1616581669271.xlsx"
+
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         

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

@@ -144,12 +144,7 @@ class YHAllApiName {
     
     //获取验证
     struct User {
-#if DEBUG
-//        static let verifyCode = "user/verify-code"
-//#else
         static let verifyCode = "cuser/user/verify-code"
-#endif
-        
     }
     
     //预览相关接口

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -20,7 +20,6 @@ class YHBaseUrlManager {
     static let baseOSSUrlTest : String = "https://test-comserver.galaxy-immi.com/"
     //正式环境-OSS
     static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/"
-//    static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/" //正式环境
     
     //h5开发环境-H5
     static let h5UrlDev : String = ""
@@ -29,6 +28,7 @@ class YHBaseUrlManager {
     
     // MARK: - 当前使用的url
     func curURL() -> String {
+        return YHBaseUrlManager.baseUrlTest //for test hjl
 #if DEBUG
         return YHBaseUrlManager.baseUrlTest
 #else
@@ -37,6 +37,7 @@ class YHBaseUrlManager {
     }
     
     func curOssURL() -> String {
+        return YHBaseUrlManager.baseOSSUrlTest //for test hjl
 #if DEBUG
         return YHBaseUrlManager.baseOSSUrlTest
 #else