Skip to content

G
galaxy-iOS
Commit f86a8014 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 称呼名称展示

parent 658b4bb3
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 67 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ f86a8014
......@@ -271,7 +271,6 @@
0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; };
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; };
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
0472CBA72C5A11640096F48F /* YHPrincipleCongratulationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */; };
0472CBA82C5A11640096F48F /* YHPrincipleUploadListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9C2C5A11640096F48F /* YHPrincipleUploadListVC.swift */; };
0472CBA92C5A11640096F48F /* YHPrincleGroupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CB9E2C5A11640096F48F /* YHPrincleGroupModel.swift */; };
0472CBAC2C5A11640096F48F /* YHPrincleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472CBA32C5A11640096F48F /* YHPrincleViewModel.swift */; };
......@@ -924,7 +923,6 @@
046AB7762BD674170086C6F1 /* galaxy.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxy.entitlements; sourceTree = "<group>"; };
046AB7772BD674170086C6F1 /* galaxyDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxyDebug.entitlements; sourceTree = "<group>"; };
046AB7782BD674170086C6F1 /* galaxyTestEnv.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxyTestEnv.entitlements; sourceTree = "<group>"; };
0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincipleCongratulationVC.swift; sourceTree = "<group>"; };
0472CB9C2C5A11640096F48F /* YHPrincipleUploadListVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadListVC.swift; sourceTree = "<group>"; };
0472CB9E2C5A11640096F48F /* YHPrincleGroupModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincleGroupModel.swift; sourceTree = "<group>"; };
0472CBA32C5A11640096F48F /* YHPrincleViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPrincleViewModel.swift; sourceTree = "<group>"; };
......@@ -2211,7 +2209,6 @@
0472CB9D2C5A11640096F48F /* C */ = {
isa = PBXGroup;
children = (
0472CB9B2C5A11640096F48F /* YHPrincipleCongratulationVC.swift */,
0472CB9C2C5A11640096F48F /* YHPrincipleUploadListVC.swift */,
04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */,
04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */,
......@@ -3628,7 +3625,6 @@
045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
04F5F8602C1944D5004A463C /* YHHKCenterViewController.swift in Sources */,
A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */,
0472CBA72C5A11640096F48F /* YHPrincipleCongratulationVC.swift in Sources */,
045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
044D0C062C22736F00C5CF5E /* YHSetExplainView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedMailViewController.swift
View file @ f86a8014
......@@ -195,8 +195,14 @@ extension YHPrincipleApprovedMailViewController {
let view = UIView()
let titleLabel = UILabel()
titleLabel.numberOfLines = 0
let title: ASAttributedString = .init("祝贺您，\(self.viewModel.waitResultModel.applicant.userName)先生！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
var name = self.viewModel.waitResultModel.applicant.userName
if name.count > 5 {
name = String(name.prefix(5)) + "..."
}
let callName = self.viewModel.envelopModel.sex == 2 ? "女士" : "先生"
let title: ASAttributedString = .init("祝贺您，\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = title
view.addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedWaitSubmitVC.swift
View file @ f86a8014
......@@ -162,8 +162,14 @@ extension YHPrincipleApprovedWaitSubmitVC {
let view = UIView()
let titleLabel = UILabel()
titleLabel.numberOfLines = 0
let title: ASAttributedString = .init("祝贺您，\(self.viewModel.waitResultModel.applicant.userName)先生！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
var name = self.viewModel.envelopModel.name
if name.count > 5 {
name = String(name.prefix(5)) + "..."
}
let callName = self.viewModel.envelopModel.sex == 2 ? "女士" : "先生"
let title: ASAttributedString = .init("祝贺您，\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = title
view.addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleCongratulationVC.swift deleted 100644 → 0
View file @ 658b4bb3
//
// YHPrincipleCongratulationVC.swift
// galaxy
//
// Created by edy on 2024/5/6.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHPrincipleCongratulationVC: YHBaseViewController {
lazy var titleLabel: UILabel = {
var label = UILabel()
label.numberOfLines = 0
let a: ASAttributedString = .init("祝贺您", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.init(hex: 0xF07300)))
let b: ASAttributedString = .init("，李先生", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
label.attributed.text = a + b
return label
}()
lazy var detailLabel: UILabel = {
var label = UILabel()
label.numberOfLines = 0
let a: ASAttributedString = .init("您【与家人】申请的【优秀人才入境计划】", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
let b: ASAttributedString = .init("已获得港府的甄选名额。", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.init(hex: 0xF07300)))
let c: ASAttributedString = .init("请您于2023年6月25日前补充更多文件，即可等待获得港府的正式批准！", .font(UIFont.PFSC_R(ofSize: 16)),.foreground(UIColor.mainTextColor))
label.attributed.text = a+b+c
return label
}()
override func viewDidLoad() {
super.viewDidLoad()
gk_navTitle = "原则批"
view.addSubview(titleLabel)
view.addSubview(detailLabel)
titleLabel.snp.makeConstraints { make in
make.top.equalTo(k_Height_NavigationtBarAndStatuBar+24)
make.left.equalTo(24)
make.right.equalTo(-24)
make.height.equalTo(34)
}
detailLabel.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(12)
make.left.equalTo(24)
make.right.equalTo(-24)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift
View file @ f86a8014
......@@ -440,8 +440,14 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
let view = UIView()
let titleLabel = UILabel()
titleLabel.numberOfLines = 0
let title: ASAttributedString = .init("祝贺您，\(self.viewModel.waitResultModel.applicant.userName)先生！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
var name = self.viewModel.waitResultModel.applicant.userName
if name.count > 5 {
name = String(name.prefix(5)) + "..."
}
let callName = self.viewModel.envelopModel.sex == 2 ? "女士" : "先生"
let title: ASAttributedString = .init("祝贺您，\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = title
view.addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleWaitResultViewController.swift
View file @ f86a8014
......@@ -46,7 +46,19 @@ class YHPrincipleWaitResultViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.view.backgroundColor = .white
self.gk_navTitle = "原则批"
// 11 原则批等待结果
// 12 原则批待补件
// 14 原则批未获批准
if self.status == 11 {
self.gk_navTitle = "等待中"
} else if self.status == 12 {
self.gk_navTitle = "未获批准"
} else if self.status == 14 {
self.gk_navTitle = "待补件"
}
gk_navigationBar.backgroundColor = .clear
createUI()
getPrincipleWaitResult()
......@@ -171,13 +183,13 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
let view = UIView()
let titleLabel = UILabel()
titleLabel.numberOfLines = 0
var name = self.viewModel.waitResultModel.applicant.userName
if name.count > 5 {
name = String(name.prefix(5)) + "..."
}
let callName = self.viewModel.waitResultModel.applicant.sex == 2 ? "女士" : "先生"
let title: ASAttributedString = .init("您好，\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
let helloName = self.status == 12 ? "很遗憾，" : "您好，"
let title: ASAttributedString = .init("\(helloName)\(name)\(callName)！", .font(UIFont.PFSC_M(ofSize: 24)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = title
view.addSubview(titleLabel)
......@@ -251,7 +263,7 @@ extension YHPrincipleWaitResultViewController: UITableViewDelegate, UITableViewD
let str1: ASAttributedString = .init("您【与家人】申请的【优秀人才入境计划】", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
let str2: ASAttributedString = .init("未获批准", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
var str3: ASAttributedString = .init("。具体详情以及后续处理方式，请您联系专属服务您的生活管家进行详细沟通", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
let str3: ASAttributedString = .init("。具体详情以及后续处理方式，请您联系专属服务您的生活管家进行详细沟通", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
return str1 + str2 + str3
}
let defaultStr: ASAttributedString = .init("")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment