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

galaxy/galaxy/AppDelegate.swift

@@ -46,14 +46,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         //        YHAnalytics.analyticsStart(launchOptions: launchOptions)
         
         
-//        var i = 0
-//        for family: String in UIFont.familyNames {
-//            print("\(i)---项目字体---\(family)")
-//            for names: String in UIFont.fontNames(forFamilyName: family) {
-//                print("== \(names)")
-//            }
-//            i += 1
-//        }
+        //        var i = 0
+        //        for family: String in UIFont.familyNames {
+        //            print("\(i)---项目字体---\(family)")
+        //            for names: String in UIFont.fontNames(forFamilyName: family) {
+        //                print("== \(names)")
+        //            }
+        //            i += 1
+        //        }
         
         return true
     }
@@ -81,13 +81,11 @@ extension AppDelegate {
             
             //1.数据解析
 #if DEBUG
-            //            SmartConfig.debugMode = .verbose
-            SmartConfig.debugMode = .none //for test hjl
+            SmartConfig.debugMode = .none
 #else
             SmartConfig.debugMode = .none
 #endif
             
-            
             //2.bugly参数设置
 #if DEBUG
             Bugly.start(withAppId: "3b10faa43e")
@@ -133,17 +131,14 @@ extension AppDelegate {
     private func setupRootVC() {
         let tabBarController = YHTabBarViewController()
         let v0 = YHNavigationController(rootVC:YHHomeViewController())
-        
-        //        let v0 = YHNavigationController(rootVC:YHPersonInformMainViewController())//for test hjl
-        
         let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
         let v2 = YHNavigationController(rootVC:YHMyViewController())
         
         v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "photo"), selectedImage: UIImage(named: "photo_1"))
         v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
         v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "find"), selectedImage: UIImage(named: "find_1"))
-        tabBarController.viewControllers = [v0,v1,v2]
-        //        tabBarController.viewControllers = [v1,v2] for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
+        //        tabBarController.viewControllers = [v0,v1,v2]
+        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
         tabBarController.tabBar.backgroundColor = .white
         
         window = UIWindow(frame: UIScreen.main.bounds)

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

@@ -137,13 +137,6 @@ class YHHomeViewController: YHBaseViewController {
         
         //1.UI
         initView()
-        
-        //2.网络请求
-//        requestData()
-        
-        
-        
-        //for test hjl
 //        testModelParse()//for test hjl  添加 数据类型 转换
     }
     
@@ -272,11 +265,11 @@ extension YHHomeViewController {
         
         
         self.homeTableView.es.addPullToRefresh {
-            self.loadFirstItem()//for test hjl
+            self.loadFirstItem()
         }
         self.homeTableView.es.startPullToRefresh()
         self.homeTableView.es.addInfiniteScrolling {
-            self.loadFakeData()//for test hjl
+            self.loadFakeData()
         }
     }
     
@@ -312,9 +305,7 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
         if section == 0 {
             return 6
         }
-        return 1//for test hjl
-        
-//        return 0 //for test hjl
+        return 1
     }
     
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift

@@ -133,11 +133,12 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
         }()
         view.addSubview(bottomView)
         bottomView.snp.makeConstraints { make in
-            make.left.right.bottom.equalTo(view)
+            make.left.right.bottom.equalToSuperview()
             make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
         }
+        bottomView.layoutIfNeeded()
+        bottomView.nextButton.addYinHeGradualLayer()
     }
-    
 }
 
 extension YHMainApplicantInformationViewController: UITableViewDelegate, UITableViewDataSource {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHBottomNextView.swift

@@ -54,8 +54,6 @@ class YHBottomNextView: UIView {
             button.layer.cornerRadius = kCornerRadius6
             button.clipsToBounds = true
             button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
-            
-            button.backgroundColor = .brandMainColor //for test hjl
             return button
         }()
         addSubview(nextButton)
@@ -65,9 +63,6 @@ class YHBottomNextView: UIView {
             make.height.equalTo(44)
             make.left.equalTo(saveButton.snp.right).offset(10)
         }
-        
-        nextButton.layoutIfNeeded()
-        nextButton.addYinHeGradualLayer()//for test hjl
     }
     
     

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

@@ -170,7 +170,6 @@ class YHOtherPickerView: UIView {
         
         whiteContentView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-//            make.top.equalToSuperview().offset(KScreenHeight*2/3.0)
             make.height.equalTo(412)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCertificateInformationItemsView.swift

@@ -62,7 +62,7 @@ extension YHPreviewInfoCertificateInformationItemsView {
                     if index == 0 {
                         //第一个
                         cellView.snp.makeConstraints { make in
-                            make.top.equalTo(tmp.snp.bottom).offset(10) //for test hjl
+                            make.top.equalTo(tmp.snp.bottom).offset(10)
                             make.right.equalToSuperview().offset(-18)
                             make.left.equalToSuperview().offset(18)
                         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoProjectItemView.swift

@@ -67,7 +67,7 @@ extension YHPreviewInfoProjectItemView {
         }
         
         let tagView : UIView = UIView()
-        tagView.backgroundColor = .failColor //for test hjl
+        tagView.backgroundColor = .failColor
         holdView.addSubview(tagView)
         if lastTagView == nil {
             tagView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmintAllInfoSuccessTipView.swift

@@ -131,7 +131,7 @@ class YHSubmintAllInfoSuccessTipView: UIView {
             label.numberOfLines = 1
             return label
         }()
-        messageLabel.backgroundColor = .clear//for test hjl
+        messageLabel.backgroundColor = .clear
         centerView.addSubview(messageLabel)
         messageLabel.snp.makeConstraints { make in
             make.top.equalTo(lable2.snp.bottom).offset(10)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutUsViewController.swift

@@ -43,7 +43,7 @@ class YHAboutUsViewController: YHBaseViewController {
         collectinoView.register(YHAboutUsAdvantageCell.self, forCellWithReuseIdentifier:YHAboutUsAdvantageCell.cellReuseIdentifier)
         collectinoView.delegate = self
         collectinoView.dataSource = self
-        collectinoView.backgroundColor = .clear //for test hjl
+        collectinoView.backgroundColor = .clear 
         return collectinoView
     }()
     

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -78,11 +78,6 @@ class YHNetRequest: NSObject {
         requestHeader.add(name:"Conatent-Type",value:"application/json")
         requestHeader.add(name:"Accept",value:"application/json")
         
-        
-        
-        /*
-         以下是测试数据 for test hjl
-         */
         requestHeader.add(name:"appid",value:"1")
         let dateStr = String(Date().timeIntervalSince1970)
         requestHeader.add(name:"timestamp",value:dateStr)
@@ -98,11 +93,6 @@ class YHNetRequest: NSObject {
         headers = requestHeader
     }
     
-//    private func testToken(_ requestHeader:inout HTTPHeaders) {
-//        //金龙的账号
-//        requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
-//    }
-    
     ///  链式语法
     func url(_ url:String?) -> Self{
         self.url = url ?? ""