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

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/V/YHlifeCollectionReusableView.swift

@@ -249,7 +249,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(centerImageView.snp.right).offset(12)
             make.right.equalToSuperview()
-            make.top.equalTo(centerImageView.snp.top)
+            make.top.equalTo(centerImageView.snp.top).offset(12)
             make.height.equalTo(22)
         }
         
@@ -296,7 +296,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
         timelabel.snp.makeConstraints { make in
             make.left.equalTo(centerImageView.snp.right).offset(12)
             make.right.equalTo(-20)
-            make.top.equalTo(centerImageView.snp.top).offset(26)
+            make.top.equalTo(centerImageView.snp.top).offset(36)
             make.height.equalTo(18)
         }
         

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

@@ -134,7 +134,7 @@ extension YHSelectViewController {
         }()
         
         tableView = {
-            let tableView = UITableView(frame: .zero, style: .grouped)
+            let tableView = UITableView(frame: .zero, style: .plain)
             tableView.contentInsetAdjustmentBehavior = .never
             tableView.backgroundColor = .white
             tableView.separatorStyle = .none

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/V/YHGCInformationFillTipsCell.swift

@@ -67,7 +67,7 @@ extension YHGCInformationFillTipsCell {
         lable1.numberOfLines = 0
         lable1.lineBreakMode = .byWordWrapping
         let a: ASAttributedString = .init("      1. 如您填写途中想离开系统，可以点击下方的", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
-        let b: ASAttributedString = .init("保存", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.brandMainColor))
+        let b: ASAttributedString = .init("保存", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.brandMainColor))
         let c: ASAttributedString = .init("，在您有空闲的时间再继续进行填写；", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
         lable1.attributed.text = a + b + c
 
@@ -84,7 +84,7 @@ extension YHGCInformationFillTipsCell {
         lable2.lineBreakMode = .byWordWrapping
 
         let aa: ASAttributedString = .init("      2. 此次填写将花费您", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
-        let bb: ASAttributedString = .init("15-30分钟", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.brandMainColor))
+        let bb: ASAttributedString = .init("15-30分钟", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.brandMainColor))
         let cc: ASAttributedString = .init("，我们将根据您所填写的信息，配置详细资料清单，一起为香港身份起航吧~", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
         lable2.attributed.text = aa + bb + cc
 
@@ -237,7 +237,7 @@ extension YHGCInformationFillTipsCell {
         lable9.textColor = UIColor.mainTextColor
         
         let aaa: ASAttributedString = .init("申请过程中有任何疑问，请随时", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor))
-        let bbb: ASAttributedString = .init("联系您的专业文案老师", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor))
+        let bbb: ASAttributedString = .init("联系您的专业文案老师", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.brandMainColor))
         let ccc: ASAttributedString = .init("为您解答护航。", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor))
         lable9.attributed.text = aaa + bbb + ccc
         let imageV44 = UIImageView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHInfoConsentForHKTravelCell.swift

@@ -103,7 +103,7 @@ class YHInfoConsentForHKTravelCell: YHResignDocumentCell {
     }
     
     func setupCellInfo(title: String, detail: ASAttributedString, question: String, showBottomLine: Bool = false, needShowFailButton: Bool) {
-        bottomLineView.isHidden = !showBottomLine
+        bottomLineView.isHidden = false
         infoTitleLabel.text = title
         infoDetailLabel.attributed.text = detail
         infoQuestionLabel.text = question
@@ -161,7 +161,7 @@ extension YHInfoConsentForHKTravelCell {
     }
 
     private func setupUI() {
-        updateCellCorner(.single)
+        updateCellCorner(.top)
         subContainerView.addSubview(infoTitleLabel)
         subContainerView.addSubview(infoDetailLabel)
         subContainerView.addSubview(topLineView)
@@ -228,7 +228,7 @@ extension YHInfoConsentForHKTravelCell {
             make.bottom.equalToSuperview()
             make.left.equalToSuperview().offset(18)
             make.right.equalToSuperview().offset(-18)
-            make.height.equalTo(0.5)
+            make.height.equalTo(1)
         }
         infoFailLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHTotalIncomeCell.swift

@@ -37,7 +37,7 @@ class YHTotalIncomeCell: YHResignDocumentCell {
 
     lazy var infoButton: UIButton = {
         let button = UIButton(type: .custom)
-        button.setImage(UIImage(named: "other_info_warning"), for: .normal)
+        button.setImage(UIImage(named: "gc_other_info_warning"), for: .normal)
         button.addTarget(self, action: #selector(infoButtonDidClick(_:)), for: .touchUpInside)
         let padding: CGFloat = 4
         button.contentEdgeInsets = UIEdgeInsets(top: padding,
@@ -79,8 +79,8 @@ extension YHTotalIncomeCell {
         infoDetailLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         
         topLineView.snp.makeConstraints { make in
-            make.left.equalToSuperview()
-            make.right.equalToSuperview()
+            make.left.equalToSuperview().offset(18)
+            make.right.equalToSuperview().offset(-18)
             make.height.equalTo(0.5)
             make.top.equalToSuperview()
         }

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

@@ -55,7 +55,7 @@ class YHCompanySelectViewController: YHBaseViewController {
             searchBar.font = UIFont.PFSC_R(ofSize: 14)
             searchBar.keyboardType = .default
             searchBar.delegate = self
-            searchBar.layer.cornerRadius = 20.5
+            searchBar.layer.cornerRadius = 3
             searchBar.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 16, height: 42))
             searchBar.leftViewMode = .always
             searchBar.clearButtonMode = .always
@@ -77,7 +77,7 @@ class YHCompanySelectViewController: YHBaseViewController {
             button.setTitle("确认", for: .normal)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-            button.layer.cornerRadius = 16.5
+            button.layer.cornerRadius = 3
             button.addTarget(self, action: #selector(submit), for: .touchUpInside)
             return button
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/C/YHGCMineSchemeViewController.swift

@@ -137,7 +137,7 @@ extension YHGCMineSchemeViewController {
                     contentStr = ""
                 }
                 
-                let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看，请您在1-2周内准备好文件并上传：", lightMessage: "1-2周内", subMessage: "按照您填报的收入信息， 证明文件如下：\(contentStr)")
+                let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "关于资料清单，您可点击查看，辛苦您在1-2周内准备好文件并上传：", lightMessage: "1-2周内", subMessage: "按照您填报的收入信息，证明文件主要包括如下内容：\(contentStr)")
                 self.dataSource?.append(model2)
                 self.tableView.reloadData()
                 let type = YHGCApplicationType(rawValue: model.application_type) ?? .typeA

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/ApplicationType(申请类别)/C/YHGCVisaProgramPopVC.swift

@@ -89,7 +89,7 @@ extension YHGCVisaProgramPopVC {
         view.addSubview(subContainerView)
         subContainerView.addSubview(infoMarkLabel)
         
-        let ratio = 143.0 / 375.0
+        let ratio = 124.0 / 375.0
         topProgramIcon.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(topProgramIcon.snp.width).multipliedBy(ratio)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/ApplicationType(申请类别)/V/YHGCApplicationTypeSelectCell.swift

@@ -19,7 +19,7 @@ class YHGCApplicationTypeSelectCell: UITableViewCell {
                 return
             }
             selectIconView.image = isCurrentSelected ? UIImage(named: "gc_application_type_selected"): UIImage(named: "gc_application_type_unselected")
-            subContainerView.lineWidth = isCurrentSelected ? 1 : nil
+            subContainerView.lineWidth = isCurrentSelected ? 2 : nil
             subContainerView.lineColor = isCurrentSelected ? selectedBorderColor.cgColor : nil
         }
     }

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLiveAppointmentViewController.swift

@@ -17,6 +17,12 @@ class YHLiveAppointmentViewController: YHBaseViewController {
         view.contentMode = .scaleAspectFit
         return view
     }()
+    
+    private lazy var topbgImageView: UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "global_default_image_bg")
+        return view
+    }()
 
     private lazy var centerContainerView: YHBaseDynamicCornerRadiusView = {
         let view = YHBaseDynamicCornerRadiusView(cornerRadius: 6, corner: .allCorners)
@@ -117,6 +123,7 @@ class YHLiveAppointmentViewController: YHBaseViewController {
         
         view.backgroundColor = UIColor.contentBkgColor
         view.addSubview(topImageView)
+        topImageView.addSubview(topbgImageView)
         view.addSubview(centerContainerView)
         centerContainerView.addSubview(flagLabel)
         centerContainerView.addSubview(liveNameLabel)
@@ -131,6 +138,10 @@ class YHLiveAppointmentViewController: YHBaseViewController {
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
             make.width.equalTo(topImageView.snp.height)
         }
+        topbgImageView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(100)
+        }
         centerContainerView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview().offset(-16)

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLiveStateViewController.swift

@@ -109,7 +109,7 @@ class YHLiveStateViewController: YHBaseViewController {
         }()
         view.addSubview(closeButton)
         closeButton.snp.makeConstraints { make in
-            make.right.equalTo(-10)
+            make.right.equalTo(-16)
             make.top.equalTo(10 + k_Height_statusBar())
             make.width.height.equalTo(24)
         }
@@ -122,7 +122,7 @@ class YHLiveStateViewController: YHBaseViewController {
         }()
         view.addSubview(shareButton)
         shareButton.snp.makeConstraints { make in
-            make.right.equalTo(-56)
+            make.right.equalTo(-62)
             make.top.equalTo(10 + k_Height_statusBar())
             make.width.height.equalTo(24)
         }
@@ -167,14 +167,14 @@ class YHLiveStateViewController: YHBaseViewController {
         lineView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.top.equalTo(loginTitleLabel.snp.bottom).offset(23)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
             make.width.equalTo(186)
         }
         
         loginSubTitleLabel = {
             let label = UILabel()
             label.text = "直播暂未开始"
-            label.font = UIFont.PFSC_R(ofSize: 17)
+            label.font = UIFont.PFSC_M(ofSize: 17)
             label.textColor = UIColor.white
             label.textAlignment = .center
             return label

galaxy/galaxy/Res/Assets.xcassets/Form/global_default_image_bg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "global_default_image_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "global_default_image_bg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/高才/收入记录/gc_other_info_warning.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "gc_other_info_warning@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "gc_other_info_warning@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/高才/申请类别/gc_visa_program_a.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gc_visa_program_a@2x.png",
+      "filename" : "弹窗背景图-A类@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "gc_visa_program_a@3x.png",
+      "filename" : "弹窗背景图-A类@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/高才/申请类别/gc_visa_program_b.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gc_visa_program_b@2x.png",
+      "filename" : "弹窗背景图-B类@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "gc_visa_program_b@3x.png",
+      "filename" : "弹窗背景图-B类@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/高才/申请类别/gc_visa_program_c.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "gc_visa_program_c@2x.png",
+      "filename" : "弹窗背景图-C类@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "gc_visa_program_c@3x.png",
+      "filename" : "弹窗背景图-C类@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }