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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3045,7 +3045,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3055,7 +3055,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Dev";
+				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Test";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
@@ -3251,7 +3251,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3299,7 +3299,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3309,7 +3309,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Dev";
+				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";

galaxy/galaxy/Classes/Base/V/YHNoDataTipView.swift

@@ -31,7 +31,7 @@ class YHNoDataTipView: UIView {
     
     private lazy var reloadBtn: UIButton = {
         let btn = UIButton.bs_button(title: "重新加载", font: UIFont.PFSC_M(ofSize: 12), normalColor: UIColor.brandMainColor)
-        btn.layer.cornerRadius = 6
+        btn.layer.cornerRadius = kCornerRadius3
         btn.layer.masksToBounds = true
         btn.layer.borderWidth = 1
         btn.layer.borderColor = UIColor.labelTextColor2.cgColor

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

@@ -133,7 +133,7 @@ class YHCertificateInfoCell: UITableViewCell {
         templateButton.setTitle("资料模版", for: .normal)
         templateButton.titleLabel?.font = .PFSC_M(ofSize: 10)
         templateButton.setTitleColor(.brandMainColor, for: .normal)
-        templateButton.layer.cornerRadius = 3
+        templateButton.layer.cornerRadius = kCornerRadius3
         templateButton.clipsToBounds = true
         templateButton.backgroundColor = .brandMainColor8
         templateButton.addTarget(self, action: #selector(didTemplateBtnClicked), for: .touchUpInside)

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

@@ -86,7 +86,7 @@ class YHDocumentMessageTableViewCell: UITableViewCell {
             label.backgroundColor = UIColor.warnColor.withAlphaComponent(0.08)
             label.textAlignment = .left
             label.text = "核对中"
-            label.layer.cornerRadius = 3
+            label.layer.cornerRadius = kCornerRadius3
             label.masksToBounds = true
             return label
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScore(我的评分)/V/YHScoreOptionsView.swift

@@ -44,7 +44,7 @@ class YHScoreOptionsView: UIView {
         customLabel.font = .PFSC_M(ofSize: 12)
         customLabel.backgroundColor = UIColor(hex:0xF8F9FB)
         customLabel.textColor = UIColor(hex: 0x888F98)
-        customLabel.layer.cornerRadius = 3
+        customLabel.layer.cornerRadius = kCornerRadius3
         customLabel.clipsToBounds = true
         customLabel.textAlignment = .center
         return customLabel

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

@@ -41,7 +41,7 @@ class YHPreviewInfoCertificatePictureItemView: UIView {
         let lable = UIImageView()
         lable.image = UIImage(named: "person_info_id_front")
         lable.contentMode = .scaleAspectFit
-        lable.layer.cornerRadius = 6
+        lable.layer.cornerRadius = kCornerRadius6
         lable.clipsToBounds = true
         return lable
     }()
@@ -51,7 +51,7 @@ class YHPreviewInfoCertificatePictureItemView: UIView {
         let lable = UIImageView()
         lable.image = UIImage(named: "person_info_id_back")
         lable.contentMode = .scaleAspectFit
-        lable.layer.cornerRadius = 6
+        lable.layer.cornerRadius = kCornerRadius6
         lable.clipsToBounds = true
         return lable
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift

@@ -160,7 +160,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
             let textField = UITextView()
             textField.backgroundColor = UIColor.contentBkgColor
             textField.font = UIFont.PFSC_R(ofSize: 14)
-            textField.layer.cornerRadius = 6
+            textField.layer.cornerRadius = kCornerRadius6
             textField.delegate = self
             textField.text = dataSource.project_highlights
             return textField

galaxy/galaxy/Classes/Modules/Login(登录)/V/验证码输入框/YHSmsCodeView.swift

@@ -55,8 +55,8 @@ class YHSmsCodeView: UIView {
     
     func config() {
         self.isUserInteractionEnabled = false
-        self.layer.cornerRadius = 6;
-        self.clipsToBounds = true;
+        self.layer.cornerRadius = kCornerRadius3
+        self.clipsToBounds = true
         self.backgroundColor = UIColor(white: 1, alpha: 0.3)
 
         self.addSubview(label)