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

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

@@ -117,7 +117,7 @@ private extension YHStartPageViewController {
             
             agreeAlertView.cancelBlock = {
                 //点击了取消按钮
-                YHCommonAlertView.show("", "确认退出银河港生活App?", "退出", "继续使用",fullGuestureEnable: false) {
+                YHCommonAlertView.show("", "确认退出银河港生活?", "退出", "继续使用",fullGuestureEnable: false) {
                     //退出
                     exit(0)
                 } callBack: {

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

@@ -58,7 +58,7 @@ class YHAgreementAlertView: UIView {
             label.textColor = UIColor.mainTextColor
             label.font = UIFont.PFSC_M(ofSize: 17)
             label.numberOfLines = 0
-            label.text = "欢迎使用银河港生活App"
+            label.text = "欢迎使用银河港生活"
             return label
         }()
         
@@ -143,9 +143,9 @@ class YHAgreementAlertView: UIView {
         
         
         
-        let a: ASAttributedString = .init("感谢您信任并使用银河港生活App，我们将通过", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
+        let a: ASAttributedString = .init("感谢您信任并使用银河港生活，我们将通过", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
         
-        let aa: ASAttributedString = .init("《银河港生活App隐私协议》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
+        let aa: ASAttributedString = .init("《银河港生活隐私协议》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
             if let block = self.urlBlock {
                 block(YHBaseUrlManager.shared.curPrivacyAgreementUrl())
             }
@@ -155,7 +155,7 @@ class YHAgreementAlertView: UIView {
         let and: ASAttributedString = .init("和", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
         
         
-        let aab: ASAttributedString = .init("《银河港生活App用户条款》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
+        let aab: ASAttributedString = .init("《银河港生活用户条款》", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.brandMainColor), .action {
             if let block = self.urlBlock {
                 block(YHBaseUrlManager.shared.curUserItemsUrl())
             }

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

@@ -81,7 +81,7 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickUploadBtn), for: .touchUpInside)
         return btn
     }()
@@ -390,7 +390,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         let statusLabel = UILabel()
         statusLabel.textAlignment = .center
         statusLabel.font = UIFont.PFSC_M(ofSize:10)
-        statusLabel.layer.cornerRadius = 3.0
+        statusLabel.layer.cornerRadius = kCornerRadius3
         statusLabel.clipsToBounds = true
         view.addSubview(statusLabel)
         

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

@@ -147,7 +147,7 @@ class YHCertificateFilterView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside)
         return btn
     }()
@@ -158,7 +158,7 @@ class YHCertificateFilterView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#F8F9FB")
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickResetBtn), for: .touchUpInside)
         return btn
     }()

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

@@ -115,7 +115,7 @@ class YHCertificateInfoCell: UITableViewCell {
         contentView.backgroundColor = UIColor(hexString:"#F8F8F8")
         
         whiteView = UIView()
-        whiteView.layer.cornerRadius = 6.0
+        whiteView.layer.cornerRadius = kCornerRadius6
         whiteView.clipsToBounds = true
         whiteView.backgroundColor = .white
         contentView.addSubview(whiteView)

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

@@ -41,7 +41,7 @@ class YHCertificateSampleTemplateView: UIView {
     func createUI() {
         
         self.backgroundColor = .contentBkgColor
-        self.layer.cornerRadius = 6.0
+        self.layer.cornerRadius = kCornerRadius6
         self.clipsToBounds = true
         
         self.addSubview(iconImgV)

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

@@ -117,7 +117,7 @@ class YHCertificateTemplateSheetView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickKnownBtn), for: .touchUpInside)
         return btn
     }()

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

@@ -26,7 +26,7 @@ class YHCertificateUploadFailTipsView: UIView {
     lazy var whiteContentView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 6.0
+        view.layer.cornerRadius = kCornerRadius6
         return view
     }()
     
@@ -60,7 +60,7 @@ class YHCertificateUploadFailTipsView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
         return btn
     }()

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

@@ -61,7 +61,7 @@ class YHFileRenameInputView: UIView {
     lazy var inputContentView: UIView = {
         let view = UIView()
         view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = 6.0
+        view.layer.cornerRadius = kCornerRadius6
         view.clipsToBounds = true
         return view
     }()
@@ -85,7 +85,7 @@ class YHFileRenameInputView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.backgroundColor = .contentBkgColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickCancelBtn), for: .touchUpInside)
         return btn
     }()
@@ -96,7 +96,7 @@ class YHFileRenameInputView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHEmailInputAlertView.swift

@@ -54,7 +54,7 @@ class YHEmailInputAlertView: UIView {
     lazy var inputContentView: UIView = {
         let view = UIView()
         view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = 6.0
+        view.layer.cornerRadius = kCornerRadius6
         view.clipsToBounds = true
         return view
     }()
@@ -77,7 +77,7 @@ class YHEmailInputAlertView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.backgroundColor = .contentBkgColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickCancelBtn), for: .touchUpInside)
         return btn
     }()
@@ -88,7 +88,7 @@ class YHEmailInputAlertView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -55,7 +55,7 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHSaveAndSubmitView.swift

@@ -79,7 +79,7 @@ class YHSaveAndSubmitView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
         return btn
     }()
@@ -90,7 +90,7 @@ class YHSaveAndSubmitView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#F8F9FB")
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift

@@ -94,7 +94,7 @@ class YHDetailMessageCell: UITableViewCell {
 
         whiteView = UIView()
         whiteView.backgroundColor = .white
-        whiteView.layer.cornerRadius = 6.0
+        whiteView.layer.cornerRadius = kCornerRadius6
         whiteView.clipsToBounds = true
         contentView.addSubview(whiteView)
         

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

@@ -29,7 +29,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
         btn.setTitleColor(UIColor(hexString:"#313131"), for: .normal)
         btn.backgroundColor = .contentBkgColor
-        btn.layer.cornerRadius = 6.0
+        btn.layer.cornerRadius = kCornerRadius6
         btn.addTarget(self, action: #selector(logout), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMySettingCell.swift

@@ -36,7 +36,7 @@ class YHMySettingCell: UITableViewCell {
     
     private lazy var redPointView: UIView = {
         let view = UIView()
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = kCornerRadius3
         view.backgroundColor = .failColor
         view.isHidden = true
         return view

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -145,7 +145,7 @@ class YHUserInfoHeaderView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#242424")
-        btn.layer.cornerRadius = 6.0
+        btn.layer.cornerRadius = kCornerRadius6
         btn.clipsToBounds = true
         btn.addTarget(self, action: #selector(didClickEvaluateBtn(btn:)), for: .touchUpInside)
         return btn
@@ -166,7 +166,7 @@ class YHUserInfoHeaderView: UIView {
     
     private lazy var settingRedPointView: UIView = {
         let view = UIView()
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = kCornerRadius3
         view.backgroundColor = .failColor
         view.isHidden = true
         return view

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHAppVersionForceUpdateView.swift

@@ -25,7 +25,7 @@ class YHAppVersionForceUpdateView: UIView {
     lazy var whiteContentView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 6.0
+        view.layer.cornerRadius = kCornerRadius6
         return view
     }()
     
@@ -60,7 +60,7 @@ class YHAppVersionForceUpdateView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickUpdateBtn), for: .touchUpInside)
         return btn
     }()
@@ -73,7 +73,7 @@ class YHAppVersionForceUpdateView: UIView {
         btn.layer.borderWidth = 1.0
         btn.layer.borderColor = UIColor.brandMainColor.cgColor
         btn.backgroundColor = .white
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickExitBtn), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHFindAppNewVersionView.swift

@@ -75,7 +75,7 @@ class YHFindAppNewVersionView: UIView {
     lazy var whiteContentView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 6.0
+        view.layer.cornerRadius = kCornerRadius6
         return view
     }()
     
@@ -98,7 +98,7 @@ class YHFindAppNewVersionView: UIView {
         label.textColor = UIColor.brandMainColor
         label.textAlignment = .center
         label.font = UIFont.PFSC_R(ofSize:14)
-        label.layer.cornerRadius = 3.0
+        label.layer.cornerRadius = kCornerRadius3
         label.layer.borderWidth = 0.5
         label.layer.borderColor = UIColor.init(hex: 0x0046B5, alpha: 0.5).cgColor
         return label
@@ -130,7 +130,7 @@ class YHFindAppNewVersionView: UIView {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = 3.0
+        btn.layer.cornerRadius = kCornerRadius3
         btn.addTarget(self, action: #selector(didClickUpdateBtn), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -29,6 +29,7 @@ public func printLog<T>(_ message: T, file: String = #file, method: String = #fu
 let kMargin : CGFloat = 16.0
 
 //圆角
+let kCornerRadius3 : CGFloat = 3.0
 let kCornerRadius4 : CGFloat = 4.0
 let kCornerRadius6 : CGFloat = 6.0
 let kCornerRadius8 : CGFloat = 8.0