Merge branch 'davidhuang' into develop

* davidhuang:
  1、修改正式环境地址 2、删除不使用的代码
  我的清单  UI完善

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -334,6 +334,7 @@
 		A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; };
 		A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */; };
 		A5D001232BAAD4B8001F003C /* YHFileListHeaerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001222BAAD4B8001F003C /* YHFileListHeaerView.swift */; };
+		A5D001252BAAEEB2001F003C /* YHFileListContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001242BAAEEB2001F003C /* YHFileListContentView.swift */; };
 		A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
 		A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
@@ -717,6 +718,7 @@
 		A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; };
 		A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChoiceButtonHoldView.swift; sourceTree = "<group>"; };
 		A5D001222BAAD4B8001F003C /* YHFileListHeaerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListHeaerView.swift; sourceTree = "<group>"; };
+		A5D001242BAAEEB2001F003C /* YHFileListContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListContentView.swift; sourceTree = "<group>"; };
 		A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
 		A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
@@ -1588,6 +1590,7 @@
 			children = (
 				A525D22F2BA83B87001A84F5 /* YHFileListBottomView.swift */,
 				A5D001222BAAD4B8001F003C /* YHFileListHeaerView.swift */,
+				A5D001242BAAEEB2001F003C /* YHFileListContentView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2253,6 +2256,7 @@
 				045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
 				045EEF042B9F171A0022A143 /* YHIdentityCardCell.swift in Sources */,
+				A5D001252BAAEEB2001F003C /* YHFileListContentView.swift in Sources */,
 				045EEEB42B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift in Sources */,
 				045EEF132B9F171A0022A143 /* YHCountryMessage.swift in Sources */,
 				045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,

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

@@ -26,13 +26,13 @@ class YHFileListViewController: YHBaseViewController {
     
     private lazy var myScrollView : UIScrollView = {
         let view = UIScrollView()
-        view.backgroundColor = .red
+        view.backgroundColor = .white
         return view
     }()
     
     
-    private lazy var myContentView : UIView = {
-        let view = UIView()
+    private lazy var myContentView : YHFileListContentView = {
+        let view = YHFileListContentView()
         view.backgroundColor = .yellow
         view.layer.cornerRadius = kCornerRadius6
         view.clipsToBounds = true
@@ -40,10 +40,6 @@ class YHFileListViewController: YHBaseViewController {
     }()
     
     
-    
-    
-    
-    
     let bottomView : YHFileListBottomView = YHFileListBottomView()
     
     override func viewDidLoad() {
@@ -59,20 +55,20 @@ class YHFileListViewController: YHBaseViewController {
 
 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 let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+            let param = ["order_id":orderID,"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()
-//            }
-//        } else {
-//            printLog("error : orderID 为空")
-//        }
+            }
+        } else {
+            printLog("error : orderID 为空")
+        }
     }
     
     func setupUI() {
@@ -80,6 +76,8 @@ extension YHFileListViewController {
         gk_navBarAlpha = 1.0
         gk_navBackgroundColor = .white
         
+        view.backgroundColor = UIColor(hex:0x0D37C7, alpha: 1.0)
+        
         view.addSubview(bottomView)
         bottomView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()

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

+//
+//  YHFileListContentView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFileListContentView: UIView {
+
+    /*
+    // Only override draw() if you perform custom drawing.
+    // An empty implementation adversely affects performance during animation.
+    override func draw(_ rect: CGRect) {
+        // Drawing code
+    }
+    */
+
+}

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

@@ -43,6 +43,35 @@ class YHFileListHeaerView: UIView {
         return imagV
     }()
     
+    //待提交
+    private lazy var waitSubmitLable : UILabel = {
+        let imagV = UILabel()
+        imagV.text = "您有 - 项待提交"
+        imagV.font = UIFont.PFSC_R(ofSize: 14)
+        imagV.textColor = UIColor.white
+        return imagV
+    }()
+    
+    //重传
+    private lazy var reuploadLable : UILabel = {
+        let imagV = UILabel()
+        imagV.text = "您有 - 项需重传"
+        imagV.font = UIFont.PFSC_R(ofSize: 14)
+        imagV.textColor = UIColor.white
+        return imagV
+    }()
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -81,7 +110,7 @@ private extension YHFileListHeaerView {
         addSubview(imagVDot1)
         imagVDot1.snp.makeConstraints { make in
             make.left.equalTo(28)
-            make.top.equalTo(topBkg.snp.bottom).offset(21)
+            make.top.equalTo(imageV1.snp.bottom).offset(21)
             make.width.height.equalTo(8)
         }
         
@@ -121,5 +150,25 @@ private extension YHFileListHeaerView {
             make.height.equalTo(23)
         }
         
+        
+       addSubview(waitSubmitLable)
+        waitSubmitLable.snp.makeConstraints { make in
+            make.centerY.equalTo(imagVDot1)
+            make.left.equalTo(imagVDot1.snp.right).offset(20)
+            make.height.equalTo(21)
+            make.right.equalTo(imagVBkg1.snp.right).offset(4)
+            
+        }
+        
+        
+        addSubview(reuploadLable)
+        reuploadLable.snp.makeConstraints { make in
+            make.centerY.equalTo(imagVDot2)
+            make.left.equalTo(imagVDot2.snp.right).offset(20)
+            make.height.equalTo(21)
+            make.right.equalTo(imagVBkg2.snp.right).offset(4)
+             
+         }
+        
     }
 }

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

@@ -37,6 +37,40 @@ class YHCertificateViewModel: YHBaseViewModel {
     var certificateEntryModel : YHCertificateEntryModel?
     var arrQuestionAndAnswer : [YHQuestionAndAnswerModel?] = []
     
+    
+    
+    //我的证件  清单列表数据
+    func getCertificateFileListData( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Certificate.documentListApi
+        
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                let dic = json.data
+                guard let resultModel = YHCertificateEntryModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    
+                    callBackBlock(false,err)
+                    return
+                }
+                self.certificateEntryModel = 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)
+        }
+    }
+    
     //获取问答列表
     func getQuestionAndAnserList( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Certificate.questionAndAnswerApi

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

@@ -185,7 +185,11 @@ class YHPhoneLoginViewController: YHBaseViewController {
                     vc.phoneNumber = self.phoneMessageView.phoneTextField.text
                     self.navigationController?.pushViewController(vc)
                 } else {
-                    YHHUD.flash(message: error?.errorMsg ?? "")
+                    var msg = error?.errorMsg ?? ""
+                    if msg.isEmpty {
+                        msg = String(error?.errorCode ?? 404)
+                    }
+                    YHHUD.flash(message: msg)
 #if DEBUG
                     let vc = YHCodeSueecssViewController()
                     vc.phoneNumber = self.phoneMessageView.phoneTextField.text

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

@@ -23,7 +23,9 @@ 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 _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
             guard let self = self else { return }
             

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

@@ -144,7 +144,7 @@ class YHAllApiName {
     
     //获取验证
     struct User {
-        static let verifyCode = "user/verify-code"
+        static let verifyCode = "cuser/user/verify-code"
     }
     
     //预览相关接口
@@ -197,6 +197,11 @@ class YHAllApiName {
         // 我的证件-状态数量统计
         static let statisticApi = "infoflow/certificate/statistic"
         
+        // 清单列表
+        static let documentListApi = "infoflow/certificate/certificate_document_list"
+        
+        
+        
         // 证件列表
         static let certificateListApi = "infoflow/needUploadItems"
         

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

@@ -11,34 +11,28 @@ class YHBaseUrlManager {
     
     static let shared = YHBaseUrlManager()
     
-    //开发环境
-//    static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/"
-//    static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
-//    static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/" //智汇银河 - 微信小程序
     //测试环境
     static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/" //APP 使用域名
     //正式环境
-    static let baseUrlRelease : String = "http://test.api.diymanager.galaxy-immi.com/"
+    static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com/"
     
+    
+    //测试环境-OSS
     static let baseOSSUrlTest : String = "https://test-comserver.galaxy-immi.com/"
-    static let baseOSSUrlRelease : 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开发环境-H5
     static let h5UrlDev : String = ""
-    //h5正式环境
+    //h5正式环境-H5
     static let h5UrlRelease : String = ""
     
-    
-    //用于外部编辑的
-    var urlForEditing : String?
-    
-    
     // MARK: - 当前使用的url
     func curURL() -> String {
 #if DEBUG
-        return urlForEditing ?? YHBaseUrlManager.baseUrlTest
+//        return YHBaseUrlManager.baseUrlTest
+        return YHBaseUrlManager.baseUrlRelease
 #else
         return YHBaseUrlManager.baseUrlRelease
 #endif
@@ -46,7 +40,8 @@ class YHBaseUrlManager {
     
     func curOssURL() -> String {
 #if DEBUG
-        return urlForEditing ?? YHBaseUrlManager.baseOSSUrlTest
+//        return YHBaseUrlManager.baseOSSUrlTest
+        return YHBaseUrlManager.baseOSSUrlRelease
 #else
         return YHBaseUrlManager.baseOSSUrlRelease
 #endif