Skip to content

G
galaxy-iOS
Commit 496f4fec authored by DavidHuang's avatar DavidHuang
Browse files
Options

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

parents 0366852f a3fac5a8
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 116 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 496f4fec
......@@ -1158,6 +1158,7 @@
04AE20562D1943EF00891D24 /* YHGCMineCertificateEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20552D1943EF00891D24 /* YHGCMineCertificateEntryViewController.swift */; };
04AE205A2D1944D600891D24 /* YHGCMyFileListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20592D1944D600891D24 /* YHGCMyFileListViewController.swift */; };
04AE20632D1ADA8100891D24 /* YHGCPreviewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20622D1ADA8100891D24 /* YHGCPreviewViewModel.swift */; };
04AE20652D1BD9B500891D24 /* YHGCCertificateEntryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20642D1BD9B500891D24 /* YHGCCertificateEntryCell.swift */; };
04EA376D2BEA06EF00DBAF64 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376C2BEA06EF00DBAF64 /* WebKit.framework */; };
04EA376F2BEA071600DBAF64 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376E2BEA070500DBAF64 /* libc++.tbd */; };
6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
......@@ -2354,6 +2355,7 @@
04AE20552D1943EF00891D24 /* YHGCMineCertificateEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMineCertificateEntryViewController.swift; sourceTree = "<group>"; };
04AE20592D1944D600891D24 /* YHGCMyFileListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMyFileListViewController.swift; sourceTree = "<group>"; };
04AE20622D1ADA8100891D24 /* YHGCPreviewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCPreviewViewModel.swift; sourceTree = "<group>"; };
04AE20642D1BD9B500891D24 /* YHGCCertificateEntryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCCertificateEntryCell.swift; sourceTree = "<group>"; };
04EA376C2BEA06EF00DBAF64 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
04EA376E2BEA070500DBAF64 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
......@@ -6357,6 +6359,7 @@
04AE20482D19413F00891D24 /* V */ = {
isa = PBXGroup;
children = (
04AE20642D1BD9B500891D24 /* YHGCCertificateEntryCell.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -7574,6 +7577,7 @@
045C12DF2D12CA5F00BD2DC0 /* YHVisaRenewalPayStatusCell.swift in Sources */,
045C12E02D12CA5F00BD2DC0 /* YHCollegeNameCell.swift in Sources */,
045C12E12D12CA5F00BD2DC0 /* YHPreviewInfoIncomeTypeCell.swift in Sources */,
04AE20652D1BD9B500891D24 /* YHGCCertificateEntryCell.swift in Sources */,
045C12E22D12CA5F00BD2DC0 /* YHUploadCertificateVC.swift in Sources */,
045C12E32D12CA5F00BD2DC0 /* YHServiceTableFootView.swift in Sources */,
045C12E42D12CA5F00BD2DC0 /* YHMsgViewModel.swift in Sources */,
......@@ -7900,7 +7904,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8044,7 +8048,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8251,7 +8255,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -8298,7 +8302,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHInformationPerfectListVC.swift
View file @ 496f4fec
......@@ -289,9 +289,9 @@ extension YHInformationPerfectListVC {
} else if productType == 1 || productType == 2 || productType == 3 { // 高才ABC
let vc = YHGCPreviewMainViewController()
vc.productType = productType
vc.orderId = orderId
vc.myDefaultIndex = index
vc.productType = productType
navigationController?.pushViewController(vc)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/V/YHCertificateEntryCell.swift
View file @ 496f4fec
......@@ -63,7 +63,7 @@ extension YHCertificateEntryCell {
color = UIColor.warnColor
} else if dataModel.checkStatus == 1 {
title = "已完成"
color = UIColor.labelTextColor2
color = UIColor(hex: 0x3CC694)
} else if dataModel.checkStatus == 2 {
title = "已驳回"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift
View file @ 496f4fec
......@@ -36,6 +36,8 @@ class YHCertificateEntryHeadView: UIView {
return titleLable
}()
let numFont = UIFont(name: "DINAlternate-Bold", size: 14)!
private lazy var statiticLable : UILabel = {
let titleLable = UILabel(text: "待上传0件，已驳回0件，审核中0件，已完成0件")
......@@ -65,19 +67,19 @@ private extension YHCertificateEntryHeadView {
}
let a: ASAttributedString = .init("待上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let aa: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let aa: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
let b: ASAttributedString = .init("件，已驳回", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let bb: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
let c: ASAttributedString = .init("件，审核中", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let cc: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let cc: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
let d: ASAttributedString = .init("件，已完成", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let dd: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let dd: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
......@@ -103,19 +105,19 @@ private extension YHCertificateEntryHeadView {
nameLable.text = "您好," + tmp
let a: ASAttributedString = .init("待上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let aa: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_submit_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let aa: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_submit_num)), .font(numFont),.foreground(UIColor.warnColor))
let b: ASAttributedString = .init("件，已驳回", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init(NSAttributedString(string: String(dataModel.reject_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let bb: ASAttributedString = .init(NSAttributedString(string: String(dataModel.reject_num)), .font(numFont),.foreground(UIColor.warnColor))
let c: ASAttributedString = .init("件，审核中", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let cc: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_audit_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let cc: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_audit_num)), .font(numFont),.foreground(UIColor.warnColor))
let d: ASAttributedString = .init("件，已完成", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
let dd: ASAttributedString = .init(NSAttributedString(string: String(dataModel.pass_num)), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let dd: ASAttributedString = .init(NSAttributedString(string: String(dataModel.pass_num)), .font(numFont),.foreground(UIColor.warnColor))
let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/V/YHCertificateInfoCell.swift
View file @ 496f4fec
......@@ -62,7 +62,7 @@ class YHCertificateInfoCell: UITableViewCell {
titleColor = .warnColor
title = "审核中".local
case .finish:
titleColor = .labelTextColor2
titleColor = UIColor(hex: 0x3CC694)
title = "已完成".local
case .all:
titleColor = .labelTextColor2
......@@ -187,7 +187,7 @@ class YHCertificateInfoCell: UITableViewCell {
nameTextView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(10)
make.top.equalToSuperview().offset(4)
make.right.equalTo(statusLabel.snp.left).offset(-26)
make.right.equalTo(statusLabel.snp.left).offset(-21)
}
infoLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @ 496f4fec
......@@ -667,7 +667,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 是否与主申请人同住 1：是 0：否
var nows: Int = 0
// 是否拥有现时定居国家/地区的永久居留身份 0:否 1:是 2没有选择
var isCurrentlyOverseas: Int = 2
var havePermanentResidency: Int = 2
// 海外居留开始时间
var residenceTime: String = ""
// 是否办理过港澳通行证 1：是 0：否
......@@ -755,7 +755,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
case isHkHandled = "is_hk_handled"
case isInHk = "is_in_hk"
case isLiveOverseaYear = "is_live_oversea_year"
case isCurrentlyOverseas = "is_currently_overseas"
case havePermanentResidency = "have_permanent_residency"
case residenceTime = "residence_time"
case surname = "surname"
}
......@@ -798,17 +798,17 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
// 是否拥有现时定居国家/地区的永久居留身份 nil表示未选
func isHavePermanentResidenceStatus() -> Bool? {
if self.isCurrentlyOverseas == 1 {
if self.havePermanentResidency == 1 {
return true
} else if self.isCurrentlyOverseas == 0 {
} else if self.havePermanentResidency == 0 {
return false
}
return nil
}
func setHavePermanentResidenceStatus(_ value: Bool) {
return self.isCurrentlyOverseas = value ? 1 : 0
return self.havePermanentResidency = value ? 1 : 0
}
// 是否在海外居住满1年及以上
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCCertificateListContainerVC.swift
View file @ 496f4fec
......@@ -146,7 +146,7 @@ class YHGCCertificateListContainerVC: YHBaseViewController {
view.addSubview(navBar)
view.addSubview(segmentContainerView)
segmentContainerView.addSubview(segmentedView)
segmentContainerView.addSubview(filterBtn)
// segmentContainerView.addSubview(filterBtn)
view.addSubview(listContainerView)
navBar.snp.makeConstraints { make in
......@@ -162,15 +162,15 @@ class YHGCCertificateListContainerVC: YHBaseViewController {
segmentedView.snp.makeConstraints { make in
make.top.left.equalToSuperview()
make.right.equalToSuperview().offset(-21-18)
make.right.equalToSuperview()
make.height.equalTo(Self.segmentHeight)
}
filterBtn.snp.makeConstraints { make in
make.width.height.equalTo(YHCertificateFilterButton.width)
make.centerY.equalToSuperview().offset(-2)
make.right.equalToSuperview().offset(-18)
}
// filterBtn.snp.makeConstraints { make in
// make.width.height.equalTo(YHCertificateFilterButton.width)
// make.centerY.equalToSuperview().offset(-2)
// make.right.equalToSuperview().offset(-18)
// }
listContainerView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCMineCertificateEntryViewController.swift
View file @ 496f4fec
......@@ -50,7 +50,7 @@ class YHGCMineCertificateEntryViewController: YHBaseViewController {
tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false
tableView.rowHeight = UITableView.automaticDimension
tableView.register(YHCertificateEntryCell.self,forCellReuseIdentifier: YHCertificateEntryCell.cellReuseIdentifier)
tableView.register(YHGCCertificateEntryCell.self,forCellReuseIdentifier: YHGCCertificateEntryCell.cellReuseIdentifier)
return tableView
}()
......@@ -168,11 +168,11 @@ extension YHGCMineCertificateEntryViewController : UITableViewDelegate,UITableVi
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return YHCertificateEntryCell.cellH
return YHGCCertificateEntryCell.cellH
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell0 = tableView.dequeueReusableCell(withClass: YHCertificateEntryCell.self)
let cell0 = tableView.dequeueReusableCell(withClass: YHGCCertificateEntryCell.self)
cell0.selectionStyle = .none
guard let model = certificateReqVM.certificateEntryModel else { return cell0 }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/V/YHGCCertificateEntryCell.swift 0 → 100644
View file @ 496f4fec
//
// YHGCCertificateEntryCell.swift
// galaxy
//
// Created by Dufet on 2024/12/25.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHGCCertificateEntryCell: UITableViewCell {
static let cellReuseIdentifier = "YHGCCertificateEntryCell"
static let cellH : CGFloat = 68.0
var dataModel : YHCategoryData? {
didSet {
updateUI()
}
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
lazy var contractNameLable = {
let lable = UILabel()
lable.textColor = UIColor.mainTextColor
lable.font = UIFont.PFSC_M(ofSize: 16)
lable.text = "主申请人（张三）"
return lable
}()
lazy var contractIdLable = {
let lable = UILabel()
lable.textColor = UIColor(hex: 0x3CC694)
lable.font = UIFont.PFSC_R(ofSize: 14)
lable.text = "已完成"
lable.textAlignment = .right
return lable
}()
}
extension YHGCCertificateEntryCell {
func updateUI() {
guard let dataModel = dataModel else { return }
var name = ""
if dataModel.userName.isEmpty == false {
name = "(" + dataModel.userName + ")"
}
contractNameLable.text = dataModel.applicantName + name
//0：未审核，1：通过 2：驳回,3：未提交',
var title = ""
var color : UIColor = .failColor
if dataModel.checkStatus == 0 {
title = "审核中"
color = UIColor.warnColor
} else if dataModel.checkStatus == 1 {
title = "已完成"
color = UIColor(hex: 0x3CC694)
} else if dataModel.checkStatus == 2 {
title = "已驳回"
color = UIColor.failColor
} else if dataModel.checkStatus == 3 {
title = "待上传"
color = UIColor.brandMainColor
} else {
title = "--"
color = UIColor.brandMainColor
}
contractIdLable.text = title
contractIdLable.textColor = color
}
func setupUI() {
let holdView = UIView()
holdView.backgroundColor = .white
holdView.layer.cornerRadius = kCornerRadius6
holdView.clipsToBounds = true
backgroundColor = .clear
contentView.backgroundColor = .clear
contentView.addSubview(holdView)
holdView.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
}
let nextImgV = UIImageView()
nextImgV.image = UIImage(named: "service_center_right_next_icon")
nextImgV.contentMode = .scaleAspectFill
holdView.addSubview(nextImgV)
nextImgV.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(-26)
make.width.height.equalTo(kMargin)
}
holdView.addSubview(contractIdLable)
contractIdLable.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(nextImgV.snp.left).offset(-2)
make.width.equalTo(50)
make.height.equalTo(20)
}
holdView.addSubview(contractNameLable)
contractNameLable.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(21)
make.right.equalTo(contractIdLable.snp.left).offset(-10)
make.height.equalTo(24)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildPrimaryInfoVC.swift
View file @ 496f4fec
......@@ -75,7 +75,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
// 居住信息
let title2 = YHFormTitleItem(type: .liveInfo)
let item20 = YHFormDetailItem(type: .isLiveTother, value:String(child.isLiveTother()))
let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(child.isCurrentlyOverseas))
let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(child.havePermanentResidency))
item21.tips = "请选择"
var arr2: [YHFormItemProtocol] = [title2, item20, item21]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Spouse(配偶)/YHGCSpousePrimaryInfoVC.swift
View file @ 496f4fec
......@@ -81,7 +81,7 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let item20 = YHFormDetailItem(type:.isLiveTother, value:String(spouse.isLiveTother()))
arr2.append(item20)
let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(spouse.isCurrentlyOverseas))
let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(spouse.havePermanentResidency))
item21.tips = "请选择"
arr2.append(item21)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
View file @ 496f4fec
......@@ -251,7 +251,7 @@ extension YHGCFamilyMemberInfoListVC {
"next":false,
"info":["subset_name":"",
"not_fill_number":-1,
"is_currently_overseas":2,
"have_permanent_residency":2,
"follow":0]]
self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHGCPreviewControllerHoldViewController.swift
View file @ 496f4fec
......@@ -11,6 +11,8 @@ import JXSegmentedView
class YHGCPreviewControllerHoldViewController: UIViewController {
var productType : Int = 0 //0-优才 1-高才A 2-高才B 3-高才C
var canScroll : Bool = false {
didSet {
for vc in arrItemVCs {
......@@ -25,7 +27,13 @@ class YHGCPreviewControllerHoldViewController: UIViewController {
}
}
let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","收入记录","其他信息"]
lazy var arrItemTitles:[String] = {
if productType == 1 { // 高才A
return ["主申请人信息","家庭成员信息","工作经验","收入记录", "基本资料"]
}
return ["主申请人信息","家庭成员信息","学历/专业资格","工作经验", "基本资料"]
}()
var arrItemVCs : [YHPreviewBaseViewController] = []
var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55))
lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
......@@ -53,46 +61,49 @@ class YHGCPreviewControllerHoldViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
do {
if productType == 1 { // 高才A
//主申请人
let vc = YHGCPreviewMainApplicantInfoViewController()
arrItemVCs.append(vc)
}
do {
let vc1 = YHGCPreviewMainApplicantInfoViewController()
arrItemVCs.append(vc1)
//家庭成员信息
let vc = YHGCPreviewFamilyMemberViewController()
arrItemVCs.append(vc)
}
do {
//基本资料
let vc = YHGCPreviewBasiceInformationViewController()
arrItemVCs.append(vc)
}
do {
//学历/专业资格
let vc = YHGCPreviewAcademicAndProfessionalQualificationViewController()
arrItemVCs.append(vc)
}
do {
let vc2 = YHGCPreviewFamilyMemberViewController()
arrItemVCs.append(vc2)
//工作经验
let vc = YHGCPreviewWorkExpViewController()
arrItemVCs.append(vc)
}
do {
let vc3 = YHGCPreviewWorkExpViewController()
arrItemVCs.append(vc3)
// 收入记录
let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int ?? 0
let vc = YHGCPreviewIncomeRecordViewController(orderId: orderID)
arrItemVCs.append(vc)
}
do {
//其他信息
let vc = YHGCPreviewOtherInformationViewController()
arrItemVCs.append(vc)
let vc4 = YHGCPreviewIncomeRecordViewController(orderId: orderID)
arrItemVCs.append(vc4)
//基本资料
let vc5 = YHGCPreviewBasiceInformationViewController()
arrItemVCs.append(vc5)
} else { // 高才BC
//主申请人
let vc1 = YHGCPreviewMainApplicantInfoViewController()
arrItemVCs.append(vc1)
//家庭成员信息
let vc2 = YHGCPreviewFamilyMemberViewController()
arrItemVCs.append(vc2)
//学历/专业资格
let vc3 = YHGCPreviewAcademicAndProfessionalQualificationViewController()
arrItemVCs.append(vc3)
//工作经验
let vc4 = YHGCPreviewWorkExpViewController()
arrItemVCs.append(vc4)
// // 收入记录
// let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int ?? 0
// let vc5 = YHGCPreviewIncomeRecordViewController(orderId: orderID)
// arrItemVCs.append(vc5)
//基本资料
let vc5 = YHGCPreviewBasiceInformationViewController()
arrItemVCs.append(vc5)
}
//segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
segmentedView.dataSource = segmentedDataSource
segmentedView.delegate = self
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHGCPreviewMainViewController.swift
View file @ 496f4fec
......@@ -34,6 +34,7 @@ class YHGCPreviewMainViewController: YHBaseViewController {
lazy var cellView: YHGCPreviewControllerHoldViewController = {
let ttt = YHGCPreviewControllerHoldViewController()
ttt.productType = self.productType
ttt.myDefaultNavItemIndex = self.myDefaultIndex
return ttt
}()
......@@ -126,7 +127,19 @@ extension YHGCPreviewMainViewController {
self.nameLable.text = title
// self.phoneLable.text = self.previewVM.mainApplicationInfoPreviewModel?.mobile ?? "-"
self.phoneLable.text = "优才计划"
var text = "高才"
// 1-高才A 2-高才B 3-高才C
if self.productType == 1 {
text = "高才A类"
} else if self.productType == 2 {
text = "高才B类"
} else if self.productType == 3 {
text = "高才C类"
}
self.phoneLable.text = text
// self.handleHeaderIcon()
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHGCPreviewViewModel.swift
View file @ 496f4fec
......@@ -492,63 +492,85 @@ private extension YHGCPreviewViewModel {
if let arr0 = model0.edu_list {
for(index,model) in arr0.enumerated() {
//主申请人学历
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "学位：", answer: model.background)
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "学校全称：", answer:model.college)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer:model.type)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "入学年月：", answer:model.admission_time)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "毕业年月：", answer: model.graduate_time)
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "专业：", answer: model.professional)
// let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: model.degree_type)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "毕业年月：", answer: model.graduate_time)
var major = model.professional
if model.professional == "其他" {
major = model.major_other
}
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "专业：", answer: major)
var title = "--"
if let item = model.school_address {
if !item.country.isEmpty {
title = item.country
}
var degree = "--"
if model.has_bachelor_degree == 1 {
degree = "学士学位"
}
if model.has_bachelor_degree == 2 {
degree = "无学位"
}
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课城市：", answer:title)
let arr = [tmp5,tmp0,tmp1,tmp2,tmp3,tmp4,tmp7]
let addationIndex = arr0.count > 1 ? String(index + 1) : ""
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历" + addationIndex, cellData0: arr)
arrDataForAcademicInfo.append(model2)
}
}
}
do {
//主申请人专业资格及会员资格
if let arr = model0.qla_list {
for(index,model) in arr.enumerated() {
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "资格证书名称：",answer:model.qualification)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "颁授机构全称：", answer:model.college)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "颁授年份：", answer:String(model.promulgation))
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "学位：", answer: degree)
// let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer:model.type)
// let tmp2 = YHPreviewQuestionAndAnswerModel(question: "入学年月：", answer:model.admission_time)
// let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: model.degree_type)
var title = ""
if let item = model.college_address {
if item.country.contains("中国") {
title = "国内 "
if item.area.count > 1 {
title = title + item.area[0] + "/" + item.area[1]
}
} else {
title = "国外 " + item.country + "-" + item.foreign
var schoolAddressBoard = model.school_address_aboard == 1 ? "国外" : "国内"
var schoolCountry = model.school_address?.country ?? ""
var address = ""
if model.school_address_aboard == 1 {
if let foreign = model.school_address?.foreign, !foreign.isEmpty {
address = foreign
}
} else {
title = "--"
if let schoolAddress = model.school_address {
if schoolAddress.area.count > 1 {
address = schoolAddress.area[1]
}
}
}
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "颁授城市：", answer:title)
let arr000 = [tmp0,tmp1,tmp2,tmp3]
var classAddress = "\(schoolAddressBoard)-\(schoolCountry)/\(address)"
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer:classAddress)
let arr = [tmp0, tmp1, tmp2, tmp3, tmp4]
let addationIndex = arr.count > 1 ? String(index + 1) : ""
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人专业资格及会员资格" + addationIndex, cellData0: arr000)
let addationIndex = arr0.count > 1 ? String(index + 1) : ""
let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历" + addationIndex, cellData0: arr)
arrDataForAcademicInfo.append(model2)
}
}
}
// do {
// //主申请人专业资格及会员资格
// if let arr = model0.qla_list {
// for(index,model) in arr.enumerated() {
// let tmp0 = YHPreviewQuestionAndAnswerModel(question: "资格证书名称：",answer:model.qualification)
// let tmp1 = YHPreviewQuestionAndAnswerModel(question: "颁授机构全称：", answer:model.college)
// let tmp2 = YHPreviewQuestionAndAnswerModel(question: "颁授年份：", answer:String(model.promulgation))
//
// var title = ""
// if let item = model.college_address {
// if item.country.contains("中国") {
// title = "国内 "
// if item.area.count > 1 {
// title = title + item.area[0] + "/" + item.area[1]
// }
// } else {
// title = "国外 " + item.country + "-" + item.foreign
// }
// } else {
// title = "--"
// }
// let tmp3 = YHPreviewQuestionAndAnswerModel(question: "颁授城市：", answer:title)
// let arr000 = [tmp0,tmp1,tmp2,tmp3]
//
//
// let addationIndex = arr.count > 1 ? String(index + 1) : ""
// let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人专业资格及会员资格" + addationIndex, cellData0: arr000)
// arrDataForAcademicInfo.append(model2)
// }
// }
// }
do {
//主申请人
let title = model0.qla_correct == 1 ? "是" : "否"
......
galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLivePlayerViewController.swift
View file @ 496f4fec
......@@ -29,6 +29,8 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
private var timer: DispatchSourceTimer?
private var isDisappearFromZoom = false
private let timeCount: Int = 120
// 进聊天室尝试次数
private let maxRetryCount = 3
// MARK: - UI Components
......@@ -347,12 +349,16 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
// MARK: - Chat Room Methods
private func joinChatRoom(roomId: String) {
func joinRoom() {
func joinRoom(retryCount: Int) {
YHIMHelper.shared.joinChatRoom(roomID: roomId, leaveOtherRooms: true) { [weak self] error in
guard let self = self else { return }
if let error = error {
if let error = error, retryCount <= self.maxRetryCount {
printLog("joinChatRoom: \(error)")
DispatchQueue.main.asyncAfter(deadline: .now() + TimeInterval(5 * (retryCount + 1))) {
YHIMHelper.shared.registerAndLoginCurrentUser { _ in
joinRoom(retryCount: retryCount + 1)
}
}
} else {
self.loadHistoryMessages(roomId: roomId)
}
......@@ -361,10 +367,10 @@ class YHLivePlayerViewController: YHBasePlayerViewController {
if !YHIMHelper.shared.isCurrentUserLogin {
YHIMHelper.shared.registerAndLoginCurrentUser { _ in
joinRoom()
joinRoom(retryCount: 0)
}
} else {
joinRoom()
joinRoom(retryCount: 0)
}
}
......
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