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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  H5处理
  UI 细节修复
  在港记录以及文书管理ui走查bug修复
  // H5加token

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

@@ -29,7 +29,7 @@ class YHHomeInfoDetailViewController: YHBaseViewController {
         collectinoView.register(YHHomeCollectionViewCell.self, forCellWithReuseIdentifier:YHHomeCollectionViewCell.cellReuseIdentifier)
         collectinoView.delegate = self
         collectinoView.dataSource = self
-        collectinoView.contentInset = UIEdgeInsets(top: 16.0, left: 0.0, bottom: 0.0, right: 0.0)
+        collectinoView.contentInset = UIEdgeInsets(top: 16.0, left: 0.0, bottom: 16.0, right: 0.0)
         collectinoView.translatesAutoresizingMaskIntoConstraints = false
         collectinoView.alwaysBounceVertical = true
         collectinoView.showsVerticalScrollIndicator = false

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -139,7 +139,11 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 if let myToken = YHLoginManager.shared.userModel?.token {
                     token = myToken
                 }
-                let url = model.skip_url + "&param=" + token
+                var url = model.skip_url + "?param=" + token
+                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                if urlHasParam {
+                    url = model.skip_url + "&param=" + token
+                }
                 printLog("url: \(url)")
                 let vc = YHHomeWebViewController()
                 vc.url = url

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/C/YHHKImmigrationRecordsVC.swift

@@ -35,10 +35,10 @@ class YHHKImmigrationRecordsVC: YHBaseViewController {
         let dataSource = JXSegmentedDotDataSource()
         dataSource.isTitleColorGradientEnabled = true
         dataSource.titles = arrItemTitles
-        dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 14)
-        dataSource.titleNormalColor = UIColor(hexString: "#000000")!
+        dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 14)
+        dataSource.titleNormalColor = .labelTextColor2
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
-        dataSource.titleSelectedColor = .mainTextColor
+        dataSource.titleSelectedColor = UIColor(hexString: "#000000")!
         dataSource.isItemSpacingAverageEnabled = false
         dataSource.itemWidth = JXSegmentedViewAutomaticDimension
         dataSource.itemSpacing = 24

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsRemarkCell.swift

@@ -23,16 +23,22 @@ class YHHKRecordsRemarkCell: YHResignDocumentCell {
         return label
     }()
     
+    private lazy var remarkTextViewContainer: YHBaseDynamicCornerRadiusView = {
+        let view = YHBaseDynamicCornerRadiusView(cornerRadius: 4, corner: .allCorners)
+        view.backgroundColor = .contentBkgColor
+        return view
+    }()
+    
     private lazy var remarkTextView: UITextView = {
         let view = UITextView()
+        view.backgroundColor = .clear
         view.font = .PFSC_R(ofSize: 14)
         view.textColor = .mainTextColor
         view.tintColor = .mainTextColor
-        view.backgroundColor = .contentBkgColor
         view.returnKeyType = .default
         view.enablesReturnKeyAutomatically = true
         view.delegate = self
-        view.textContainerInset = UIEdgeInsets(top: 10, left: 12, bottom: 10, right: 12)
+        view.textContainerInset = .zero
         view.textContainer.lineFragmentPadding = 0
         return view
     }()
@@ -69,23 +75,33 @@ extension YHHKRecordsRemarkCell {
     
     private func setupUI() {
         subContainerView.addSubview(infoTitleLabel)
-        subContainerView.addSubview(remarkTextView)
+        subContainerView.addSubview(remarkTextViewContainer)
+        remarkTextViewContainer.addSubview(remarkTextView)
         subContainerView.addSubview(editTipsLabel)
         
         infoTitleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(18)
             make.top.equalToSuperview().offset(16)
         }
-        remarkTextView.snp.makeConstraints { make in
+        
+        remarkTextViewContainer.snp.makeConstraints { make in
             make.left.equalTo(infoTitleLabel)
             make.right.equalToSuperview().offset(-18)
             make.height.equalTo(86).priority(.high)
             make.top.equalTo(infoTitleLabel.snp.bottom).offset(8)
             make.bottom.equalToSuperview().offset(-16)
         }
+        
+        remarkTextView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(12)
+            make.right.equalToSuperview().offset(-12)
+            make.top.equalToSuperview().offset(10)
+            make.bottom.equalToSuperview().offset(-10)
+        }
+
         editTipsLabel.snp.makeConstraints { make in
-            make.left.equalTo(remarkTextView.snp.left).offset(12)
-            make.top.equalTo(remarkTextView.snp.top).offset(10)
+            make.left.equalTo(remarkTextViewContainer.snp.left).offset(12)
+            make.top.equalTo(remarkTextViewContainer.snp.top).offset(10)
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentStatusCell.swift

@@ -348,9 +348,9 @@ extension YHResignDocumentStatusCell {
         }
         
         bottomLineView.snp.makeConstraints { make in
-            make.left.equalTo(infoTitleLabel.snp.left)
+            make.left.equalToSuperview()
             make.top.equalTo(fileCoverView.snp.bottom)
-            make.right.equalToSuperview().offset(-18)
+            make.right.equalToSuperview()
             make.height.equalTo(0.5)
         }
         

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

@@ -123,12 +123,17 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                let vc = YHHomeWebViewController()
                 var token = ""
                 if let myToken = YHLoginManager.shared.userModel?.token {
                     token = myToken
                 }
-                let url = model.skip_url + "&param=" + token
+                var url = model.skip_url + "?param=" + token
+                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                if urlHasParam {
+                    url = model.skip_url + "&param=" + token
+                }
+                printLog("url: \(url)")
+                let vc = YHHomeWebViewController()
                 vc.url = url
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 2: //跳转APP内Tab

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

@@ -73,6 +73,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
         bgView = {
             let view = UIView()
             view.backgroundColor = UIColor.contentBkgColor
+            view.layer.cornerRadius = 4
             return view
         }()
         addSubview(bgView)

galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift

@@ -19,6 +19,13 @@ func isEmptyString(_ string: String?) -> Bool {
 
 extension String {
     
+    static func hasQueryParameters(urlString: String) -> Bool {
+        if let url = URL(string: urlString) {
+            return url.query != nil && !url.query!.isEmpty
+        }
+        return false
+    }
+    
     static func randomAlphaNumericStringT(_ length: Int) -> String {
         let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
         let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)