Commit 46688dd5 authored by pete谢兆麟's avatar pete谢兆麟

代码修改

parent dc641853
...@@ -33,7 +33,8 @@ platform :ios do ...@@ -33,7 +33,8 @@ platform :ios do
sc_105_branch = "sc-1.0.5" sc_105_branch = "sc-1.0.5"
main_fix = "main-fix" main_fix = "main-fix"
jiaofei = "jiaofei" jiaofei = "jiaofei"
jiaofei = "jiaofei"
#打包正使用的分支 #打包正使用的分支
myPack_branch = develop_branch myPack_branch = develop_branch
......
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
// Copyright © 2024 www.davidhuang.com. All rights reserved. // Copyright © 2024 www.davidhuang.com. All rights reserved.
// //
import UIKit
import Alamofire import Alamofire
import SmartCodable import SmartCodable
import UIKit
class YHSmallWhiteBarInfo: SmartCodable { class YHSmallWhiteBarInfo: SmartCodable {
var start_time: String = ""// 开始时间 var start_time: String = "" // 开始时间
var end_time: String = ""// 结束时间 var end_time: String = "" // 结束时间
required init() { required init() {
} }
} }
...@@ -32,23 +32,24 @@ class YHCardOcrModel: SmartCodable { ...@@ -32,23 +32,24 @@ class YHCardOcrModel: SmartCodable {
var back_end_of_term: String = "" var back_end_of_term: String = ""
var back_hk_type: String = "" var back_hk_type: String = ""
var back_round_trip_number: String = "" var back_round_trip_number: String = ""
required init() { required init() {
} }
} }
class YHBaseViewModel { class YHBaseViewModel {
// MARK: 属性 // MARK: 属性
// 小白条信息 // 小白条信息
var smallWhiteBarInfo: YHSmallWhiteBarInfo? var smallWhiteBarInfo: YHSmallWhiteBarInfo?
// MARK: 接口 // MARK: 接口
// 3、ocr识别 中国身份证 正/反面 // 3、ocr识别 中国身份证 正/反面
func getChinaCardInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) { func getChinaCardInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn
let params: [String: Any] = ["url": url, let params: [String: Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象 // 1. json字符串 转 对象
guard self != nil else { guard self != nil else {
...@@ -69,12 +70,12 @@ class YHBaseViewModel { ...@@ -69,12 +70,12 @@ class YHBaseViewModel {
callBackBlock(false, nil) callBackBlock(false, nil)
} }
} }
// 2.2、ocr识别 港澳通行证 背面 // 2.2、ocr识别 港澳通行证 背面
func getHKCardBackInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) { func getHKCardBackInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OCR.hkmacowBackInfoApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OCR.hkmacowBackInfoApi
let params: [String: Any] = ["url": url, let params: [String: Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象 // 1. json字符串 转 对象
guard self != nil else { guard self != nil else {
...@@ -86,7 +87,7 @@ class YHBaseViewModel { ...@@ -86,7 +87,7 @@ class YHBaseViewModel {
callBackBlock(false, nil) callBackBlock(false, nil)
return return
} }
callBackBlock(true, result) callBackBlock(true, result)
} else { } else {
let _: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg) let _: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
...@@ -96,12 +97,12 @@ class YHBaseViewModel { ...@@ -96,12 +97,12 @@ class YHBaseViewModel {
callBackBlock(false, nil) callBackBlock(false, nil)
} }
} }
// 2、ocr识别 港澳通行证 正面 // 2、ocr识别 港澳通行证 正面
func getHKCardInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) { func getHKCardInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk
let params: [String: Any] = ["url": url, let params: [String: Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象 // 1. json字符串 转 对象
guard self != nil else { guard self != nil else {
...@@ -122,7 +123,7 @@ class YHBaseViewModel { ...@@ -122,7 +123,7 @@ class YHBaseViewModel {
callBackBlock(false, nil) callBackBlock(false, nil)
} }
} }
// 1、ocr获取小白条信息 // 1、ocr获取小白条信息
func getSmallWhiteBarInfoByOcr(_ url: String, callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) { func getSmallWhiteBarInfoByOcr(_ url: String, callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
if YHNetworkStatusManager.shared.isNetWorkOK == false { if YHNetworkStatusManager.shared.isNetWorkOK == false {
...@@ -130,11 +131,10 @@ class YHBaseViewModel { ...@@ -130,11 +131,10 @@ class YHBaseViewModel {
YHHUD.flash(message: "网络不可用,请检查网络设置") YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置") let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(false, errorModel) callBackBlock(false, errorModel)
return
} }
return return
} }
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OCR.smallWhiteBarApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OCR.smallWhiteBarApi
let params: [String: Any] = ["url": url] let params: [String: Any] = ["url": url]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
...@@ -158,25 +158,24 @@ class YHBaseViewModel { ...@@ -158,25 +158,24 @@ class YHBaseViewModel {
callBackBlock(false, err) callBackBlock(false, err)
} }
} }
// 图片上传 // 图片上传
func uploadImage(_ image: UIImage, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) { func uploadImage(_ image: UIImage, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) {
// #if DEBUG // #if DEBUG
// let size = image.imageSize() // let size = image.imageSize()
// YHHUD.flash(message: "\(Float(size/1024/1024))M") // YHHUD.flash(message: "\(Float(size/1024/1024))M")
// #endif // #endif
if YHNetworkStatusManager.shared.isNetWorkOK == false { if YHNetworkStatusManager.shared.isNetWorkOK == false {
DispatchQueue.main.async { DispatchQueue.main.async {
YHHUD.flash(message: "网络不可用,请检查网络设置") YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置") let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(nil, errorModel) callBackBlock(nil, errorModel)
return
} }
return return
} }
YHOSSManager.share.updateToken { YHOSSManager.share.updateToken {
YHOSSManager.share.putObject(image: image, isPublic) {[weak self] success, error in YHOSSManager.share.putObject(image: image, isPublic) { [weak self] success, error in
guard let _ = self else { return } guard let _ = self else { return }
DispatchQueue.main.async { DispatchQueue.main.async {
// 在这里执行需要在主线程上完成的任务 // 在这里执行需要在主线程上完成的任务
...@@ -185,7 +184,7 @@ class YHBaseViewModel { ...@@ -185,7 +184,7 @@ class YHBaseViewModel {
} }
} }
} }
// 获取公链URL // 获取公链URL
func getPublicImageUrl(_ url: String, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) { func getPublicImageUrl(_ url: String, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) {
if YHNetworkStatusManager.shared.isNetWorkOK == false { if YHNetworkStatusManager.shared.isNetWorkOK == false {
...@@ -193,7 +192,6 @@ class YHBaseViewModel { ...@@ -193,7 +192,6 @@ class YHBaseViewModel {
YHHUD.flash(message: "网络不可用,请检查网络设置") YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置") let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(nil, errorModel) callBackBlock(nil, errorModel)
return
} }
return return
} }
...@@ -207,21 +205,19 @@ class YHBaseViewModel { ...@@ -207,21 +205,19 @@ class YHBaseViewModel {
}) })
} }
} }
// 上传方法 // 上传方法
func uploadFile(_ url: String, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) { func uploadFile(_ url: String, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) {
if YHNetworkStatusManager.shared.isNetWorkOK == false { if YHNetworkStatusManager.shared.isNetWorkOK == false {
DispatchQueue.main.async { DispatchQueue.main.async {
YHHUD.flash(message: "网络不可用,请检查网络设置") YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置") let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(nil, errorModel) callBackBlock(nil, errorModel)
return
} }
return return
} }
YHOSSManager.share.updateToken { YHOSSManager.share.updateToken {
YHOSSManager.share.putFile(file: url, isPublic, callBackBlock: {[weak self] success, error in YHOSSManager.share.putFile(file: url, isPublic, callBackBlock: { [weak self] success, error in
guard let _ = self else { return } guard let _ = self else { return }
DispatchQueue.main.async { DispatchQueue.main.async {
// 在这里执行需要在主线程上完成的任务 // 在这里执行需要在主线程上完成的任务
...@@ -230,7 +226,7 @@ class YHBaseViewModel { ...@@ -230,7 +226,7 @@ class YHBaseViewModel {
}) })
} }
} }
// 验证url是否可直接访问 // 验证url是否可直接访问
func checkUrlIsDirectAccess(_ url: String, callback: @escaping (Bool) -> Void) { func checkUrlIsDirectAccess(_ url: String, callback: @escaping (Bool) -> Void) {
guard !url.isEmpty, let urlToGo = URL(string: url) else { guard !url.isEmpty, let urlToGo = URL(string: url) else {
...@@ -238,7 +234,7 @@ class YHBaseViewModel { ...@@ -238,7 +234,7 @@ class YHBaseViewModel {
return return
} }
let task = URLSession.shared.dataTask(with: urlToGo) { let task = URLSession.shared.dataTask(with: urlToGo) {
(_, response, error) in _, response, error in
if error != nil { if error != nil {
// url 不可用 // url 不可用
callback(false) callback(false)
...@@ -252,7 +248,7 @@ class YHBaseViewModel { ...@@ -252,7 +248,7 @@ class YHBaseViewModel {
if httpResponse.statusCode == 200 { if httpResponse.statusCode == 200 {
// url可用 // url可用
callback(true) callback(true)
} else { } else {
// url 不可用 // url 不可用
callback(false) callback(false)
...@@ -260,13 +256,13 @@ class YHBaseViewModel { ...@@ -260,13 +256,13 @@ class YHBaseViewModel {
} }
task.resume() task.resume()
} }
// 传入的url无论是公链还是私链 最后返回一个可用链(私转公失败会返回空) // 传入的url无论是公链还是私链 最后返回一个可用链(私转公失败会返回空)
func getRealUsefulUrl(_ url: String, callback: @escaping (String) -> Void) { func getRealUsefulUrl(_ url: String, callback: @escaping (String) -> Void) {
// 判断url是否可以直接访问 // 判断url是否可以直接访问
self.checkUrlIsDirectAccess(url) { checkUrlIsDirectAccess(url) {
isAccess in isAccess in
if isAccess { if isAccess {
// url能直接访问 // url能直接访问
DispatchQueue.main.async { DispatchQueue.main.async {
......
...@@ -94,48 +94,28 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -94,48 +94,28 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
centerView.snp.makeConstraints { make in
make.left.equalTo(12)
make.top.equalTo(8)
make.right.equalTo(-12)
make.bottom.equalTo(-8)
}
titleLeftImageView = { titleLeftImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "invitation_with_gifts_second_left") view.image = UIImage(named: "invitation_with_gifts_second_left")
return view return view
}() }()
centerView.addSubview(titleLeftImageView) centerView.addSubview(titleLeftImageView)
titleLeftImageView.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(29)
make.width.equalTo(110)
make.height.equalTo(20)
}
titleRightImageView = { titleRightImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "invitation_with_gifts_second_right") view.image = UIImage(named: "invitation_with_gifts_second_right")
return view return view
}() }()
centerView.addSubview(titleRightImageView) centerView.addSubview(titleRightImageView)
titleRightImageView.snp.makeConstraints { make in
make.width.equalTo(110)
make.top.equalTo(29)
make.right.equalTo(-15)
make.height.equalTo(20)
}
titleImageView = { titleImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "invitation_with_gifts_second_title") view.image = UIImage(named: "invitation_with_gifts_second_title")
return view return view
}() }()
centerView.addSubview(titleImageView) centerView.addSubview(titleImageView)
titleImageView.snp.makeConstraints { make in
make.width.equalTo(80)
make.top.equalTo(29)
make.centerX.equalToSuperview()
make.height.equalTo(20)
}
timeLabel = { timeLabel = {
let view = UILabel() let view = UILabel()
view.text = "您的推荐周期:2023-11-20 至2024-11-19" view.text = "您的推荐周期:2023-11-20 至2024-11-19"
...@@ -145,12 +125,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -145,12 +125,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(timeLabel) centerView.addSubview(timeLabel)
timeLabel.snp.makeConstraints { make in
make.width.equalTo(300)
make.top.equalTo(63)
make.centerX.equalToSuperview()
make.height.equalTo(18)
}
numberBgView = { numberBgView = {
let view = UIImageView() let view = UIImageView()
...@@ -158,12 +132,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -158,12 +132,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(numberBgView) centerView.addSubview(numberBgView)
numberBgView.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(97)
make.right.equalTo(-15)
make.height.equalTo(78)
}
lineImageView = { lineImageView = {
let view = UIImageView() let view = UIImageView()
...@@ -171,12 +139,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -171,12 +139,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(lineImageView) centerView.addSubview(lineImageView)
lineImageView.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(187)
make.right.equalTo(-15)
make.height.equalTo(1)
}
recommendLabel = { recommendLabel = {
let label = UILabel() let label = UILabel()
...@@ -186,12 +148,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -186,12 +148,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(recommendLabel) centerView.addSubview(recommendLabel)
recommendLabel.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(203)
make.right.equalTo(-15)
make.height.equalTo(21)
}
recommendButton = { recommendButton = {
let button = UIButton() let button = UIButton()
...@@ -201,12 +157,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -201,12 +157,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(recommendButton) centerView.addSubview(recommendButton)
recommendButton.snp.makeConstraints { make in
make.width.equalTo(47)
make.top.equalTo(205)
make.right.equalTo(-15)
make.height.equalTo(18)
}
numberTwoView = { numberTwoView = {
let view = YHInvitationNumberItemView() let view = YHInvitationNumberItemView()
...@@ -214,23 +164,12 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -214,23 +164,12 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
numberBgView.addSubview(numberTwoView) numberBgView.addSubview(numberTwoView)
numberTwoView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.height.equalTo(78)
make.width.equalTo(71)
}
numberOneView = { numberOneView = {
let view = YHInvitationNumberItemView() let view = YHInvitationNumberItemView()
return view return view
}() }()
numberBgView.addSubview(numberOneView) numberBgView.addSubview(numberOneView)
numberOneView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(numberTwoView.snp.left).offset(-30)
make.height.equalTo(78)
make.width.equalTo(71)
}
numberThreeView = { numberThreeView = {
let view = YHInvitationNumberItemView() let view = YHInvitationNumberItemView()
...@@ -238,32 +177,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -238,32 +177,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
numberBgView.addSubview(numberThreeView) numberBgView.addSubview(numberThreeView)
numberThreeView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(numberTwoView.snp.right).offset(30)
make.height.equalTo(78)
make.width.equalTo(71)
}
let firstlineView = UIView()
firstlineView.backgroundColor = .white
numberBgView.addSubview(firstlineView)
firstlineView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(numberTwoView.snp.left).offset(-14)
make.height.equalTo(24)
make.width.equalTo(1)
}
let lastlineView = UIView()
lastlineView.backgroundColor = .white
numberBgView.addSubview(lastlineView)
lastlineView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(numberTwoView.snp.right).offset(14)
make.height.equalTo(24)
make.width.equalTo(1)
}
explainLabel = { explainLabel = {
let view = UILabel() let view = UILabel()
...@@ -274,12 +187,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -274,12 +187,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(explainLabel) centerView.addSubview(explainLabel)
explainLabel.snp.makeConstraints { make in
make.width.equalTo(300)
make.bottom.equalTo(-18)
make.centerX.equalToSuperview()
make.height.equalTo(18)
}
peopleOneView = { peopleOneView = {
let view = YHInvitationPeopleItemView() let view = YHInvitationPeopleItemView()
...@@ -289,12 +196,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -289,12 +196,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(peopleOneView) centerView.addSubview(peopleOneView)
peopleOneView.snp.makeConstraints { make in
make.top.equalTo(239)
make.left.equalTo(15)
make.height.equalTo(37)
make.width.equalTo(100)
}
peopleFiveView = { peopleFiveView = {
let view = YHInvitationPeopleItemView() let view = YHInvitationPeopleItemView()
...@@ -310,12 +211,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -310,12 +211,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(peopleFiveView) centerView.addSubview(peopleFiveView)
peopleFiveView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(-15)
make.height.equalTo(37)
make.width.equalTo(38)
}
peopleFourView = { peopleFourView = {
let view = YHInvitationPeopleItemView() let view = YHInvitationPeopleItemView()
...@@ -329,12 +224,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -329,12 +224,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(peopleFourView) centerView.addSubview(peopleFourView)
peopleFourView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(peopleFiveView.snp.left).offset(-1)
make.height.equalTo(37)
make.width.equalTo(38)
}
peopleThreeView = { peopleThreeView = {
let view = YHInvitationPeopleItemView() let view = YHInvitationPeopleItemView()
...@@ -348,12 +237,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -348,12 +237,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(peopleThreeView) centerView.addSubview(peopleThreeView)
peopleThreeView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(peopleFourView.snp.left).offset(-1)
make.height.equalTo(37)
make.width.equalTo(38)
}
peopleTwoView = { peopleTwoView = {
let view = YHInvitationPeopleItemView() let view = YHInvitationPeopleItemView()
...@@ -361,12 +244,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -361,12 +244,6 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(peopleTwoView) centerView.addSubview(peopleTwoView)
peopleTwoView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(peopleThreeView.snp.left).offset(-1)
make.height.equalTo(37)
make.left.equalTo(peopleOneView.snp.right).offset(1)
}
tableView = { tableView = {
let tableView = UITableView(frame: .zero, style: .grouped) let tableView = UITableView(frame: .zero, style: .grouped)
...@@ -382,6 +259,137 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -382,6 +259,137 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
return tableView return tableView
}() }()
centerView.addSubview(tableView) centerView.addSubview(tableView)
makeConstraint()
}
func makeConstraint() {
centerView.snp.makeConstraints { make in
make.left.equalTo(12)
make.top.equalTo(8)
make.right.equalTo(-12)
make.bottom.equalTo(-8)
}
titleLeftImageView.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(29)
make.width.equalTo(110)
make.height.equalTo(20)
}
titleRightImageView.snp.makeConstraints { make in
make.width.equalTo(110)
make.top.equalTo(29)
make.right.equalTo(-15)
make.height.equalTo(20)
}
titleImageView.snp.makeConstraints { make in
make.width.equalTo(80)
make.top.equalTo(29)
make.centerX.equalToSuperview()
make.height.equalTo(20)
}
timeLabel.snp.makeConstraints { make in
make.width.equalTo(300)
make.top.equalTo(63)
make.centerX.equalToSuperview()
make.height.equalTo(18)
}
numberBgView.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(97)
make.right.equalTo(-15)
make.height.equalTo(78)
}
lineImageView.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(187)
make.right.equalTo(-15)
make.height.equalTo(1)
}
recommendLabel.snp.makeConstraints { make in
make.left.equalTo(15)
make.top.equalTo(203)
make.right.equalTo(-15)
make.height.equalTo(21)
}
recommendButton.snp.makeConstraints { make in
make.width.equalTo(47)
make.top.equalTo(205)
make.right.equalTo(-15)
make.height.equalTo(18)
}
numberTwoView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.height.equalTo(78)
make.width.equalTo(71)
}
numberOneView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(numberTwoView.snp.left).offset(-30)
make.height.equalTo(78)
make.width.equalTo(71)
}
numberThreeView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(numberTwoView.snp.right).offset(30)
make.height.equalTo(78)
make.width.equalTo(71)
}
let firstlineView = UIView()
firstlineView.backgroundColor = .white
numberBgView.addSubview(firstlineView)
firstlineView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(numberTwoView.snp.left).offset(-14)
make.height.equalTo(24)
make.width.equalTo(1)
}
let lastlineView = UIView()
lastlineView.backgroundColor = .white
numberBgView.addSubview(lastlineView)
lastlineView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(numberTwoView.snp.right).offset(14)
make.height.equalTo(24)
make.width.equalTo(1)
}
explainLabel.snp.makeConstraints { make in
make.width.equalTo(300)
make.bottom.equalTo(-18)
make.centerX.equalToSuperview()
make.height.equalTo(18)
}
peopleOneView.snp.makeConstraints { make in
make.top.equalTo(239)
make.left.equalTo(15)
make.height.equalTo(37)
make.width.equalTo(100)
}
peopleFiveView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(-15)
make.height.equalTo(37)
make.width.equalTo(38)
}
peopleFourView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(peopleFiveView.snp.left).offset(-1)
make.height.equalTo(37)
make.width.equalTo(38)
}
peopleThreeView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(peopleFourView.snp.left).offset(-1)
make.height.equalTo(37)
make.width.equalTo(38)
}
peopleTwoView.snp.makeConstraints { make in
make.top.equalTo(239)
make.right.equalTo(peopleThreeView.snp.left).offset(-1)
make.height.equalTo(37)
make.left.equalTo(peopleOneView.snp.right).offset(1)
}
tableView.snp.makeConstraints { make in tableView.snp.makeConstraints { make in
make.top.equalTo(276) make.top.equalTo(276)
make.bottom.equalTo(-46) make.bottom.equalTo(-46)
...@@ -403,9 +411,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -403,9 +411,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
self.tableView.reloadData() self.tableView.reloadData()
} }
} }
} }
@objc func selectItem() { @objc func selectItem() {
YHInvitationWithGiftsSelectItemView.show(selectOne: selectOne ?? 100, selectTwo: selectTwo ?? 100, startTime: startTime, endTime: endTime) { [weak self] one, two, start, end in YHInvitationWithGiftsSelectItemView.show(selectOne: selectOne ?? 100, selectTwo: selectTwo ?? 100, startTime: startTime, endTime: endTime) { [weak self] one, two, start, end in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -422,6 +422,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -422,6 +422,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
return 3 return 3
} }
// swiftlint:disable function_body_length
// swiftlint:disable cyclomatic_complexity
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if stepView.currentIndex == 0 { if stepView.currentIndex == 0 {
let cell = tableView.dequeueReusableCell(withClass: YHDocumentMessageTableViewCell.self) let cell = tableView.dequeueReusableCell(withClass: YHDocumentMessageTableViewCell.self)
...@@ -488,23 +490,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -488,23 +490,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
emailInputView.textField.becomeFirstResponder() emailInputView.textField.becomeFirstResponder()
} }
}.show() }.show()
// YHHUD.show(.progress(message: ""))
// self.viewModel.requestDocumentsTemporaryUrl("\(id)", callBackBlock: {[weak self] success, error in
// YHHUD.hide()
// guard let self = self else { return }
// if success {
// self.viewModel.requestDocumentRecord("\(id)", 1) { success, error in
// }
// guard let url = URL(string: self.viewModel?.urlModel?.url) else { return }
// let tmpVC = SFSafariViewController(url: url)
// tmpVC.dismissButtonStyle = .close
// tmpVC.delegate = self
// tmpVC.modalPresentationStyle = .fullScreen
// present(tmpVC, animated: true, completion: nil)
// } else {
// YHHUD.flash(message: error?.errorMsg ?? "")
// }
// })
} }
} }
return cell return cell
...@@ -803,6 +788,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -803,6 +788,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
} }
} }
// swiftlint:enable function_body_length
// swiftlint:enable cyclomatic_complexity
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if stepView.currentIndex == 0 { if stepView.currentIndex == 0 {
......
...@@ -263,12 +263,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -263,12 +263,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return view return view
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
centerView.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(0)
make.bottom.equalTo(0)
}
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
// label.font = UIFont.PFSC_M(ofSize: 17) // label.font = UIFont.PFSC_M(ofSize: 17)
...@@ -285,11 +279,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -285,11 +279,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(16)
make.height.equalTo(20)
}
exampleButton = { exampleButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08) button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
...@@ -302,25 +291,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -302,25 +291,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(exampleButton) centerView.addSubview(exampleButton)
exampleButton.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(8)
make.centerY.equalTo(titleLabel.snp.centerY)
make.height.equalTo(16)
make.width.equalTo(48)
}
let lineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(lineView)
lineView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(52)
make.height.equalTo(1)
}
frontLabel = { frontLabel = {
let label = UILabel() let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 12) label.font = UIFont.PFSC_R(ofSize: 12)
...@@ -330,12 +300,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -330,12 +300,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(frontLabel) centerView.addSubview(frontLabel)
frontLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
backSurfaceLabel = { backSurfaceLabel = {
let label = UILabel() let label = UILabel()
...@@ -346,12 +310,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -346,12 +310,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(backSurfaceLabel) centerView.addSubview(backSurfaceLabel)
backSurfaceLabel.snp.makeConstraints { make in
make.right.equalTo(-18)
make.left.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
frontImageButton = { frontImageButton = {
let button = YHCardButton() let button = YHCardButton()
...@@ -363,12 +321,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -363,12 +321,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(frontImageButton) centerView.addSubview(frontImageButton)
frontImageButton.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(102)
make.height.equalTo(91)
make.width.equalTo(CGFloat(147).fix)
}
frontDeleteButton = { frontDeleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
...@@ -378,12 +330,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -378,12 +330,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(frontDeleteButton) centerView.addSubview(frontDeleteButton)
frontDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(frontImageButton.snp.right)
make.centerY.equalTo(frontImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
backSurfaceImageButton = { backSurfaceImageButton = {
let button = YHCardButton() let button = YHCardButton()
...@@ -395,12 +341,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -395,12 +341,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(backSurfaceImageButton) centerView.addSubview(backSurfaceImageButton)
backSurfaceImageButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(102)
make.height.equalTo(91)
make.width.equalTo(CGFloat(147).fix)
}
backSurfaceDeleteButton = { backSurfaceDeleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
...@@ -410,12 +350,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -410,12 +350,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(backSurfaceDeleteButton) centerView.addSubview(backSurfaceDeleteButton)
backSurfaceDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(backSurfaceImageButton.snp.right)
make.centerY.equalTo(backSurfaceImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
activityIndicator = { activityIndicator = {
let view = UIActivityIndicatorView() let view = UIActivityIndicatorView()
...@@ -423,12 +357,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -423,12 +357,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(activityIndicator) centerView.addSubview(activityIndicator)
activityIndicator.snp.makeConstraints { make in
make.center.equalTo(backSurfaceImageButton.snp.center)
make.height.equalTo(25)
make.width.equalTo(25)
}
showMessageLabel = { showMessageLabel = {
let label = UILabel() let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 12) label.font = UIFont.PFSC_R(ofSize: 12)
...@@ -437,14 +365,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -437,14 +365,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(showMessageLabel) centerView.addSubview(showMessageLabel)
showMessageLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(201)
make.height.equalTo(20)
}
// 【证件信息 UI】
cerInfoLabel = { cerInfoLabel = {
let label = UILabel() let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 15) label.font = UIFont.PFSC_M(ofSize: 15)
...@@ -453,12 +373,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -453,12 +373,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(cerInfoLabel) centerView.addSubview(cerInfoLabel)
cerInfoLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(229)
make.height.equalTo(20)
}
cerNumberView = { cerNumberView = {
let view = YHItemView() let view = YHItemView()
let line = UIView() let line = UIView()
...@@ -477,12 +391,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -477,12 +391,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(cerNumberView) centerView.addSubview(cerNumberView)
cerNumberView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cerInfoLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cerSignPlaceView = { cerSignPlaceView = {
let view = YHItemView() let view = YHItemView()
...@@ -502,13 +410,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -502,13 +410,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(cerSignPlaceView) centerView.addSubview(cerSignPlaceView)
cerSignPlaceView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cerNumberView.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
// 【卡片有效期 UI】 // 【卡片有效期 UI】
cardLabel = { cardLabel = {
let label = UILabel() let label = UILabel()
...@@ -518,12 +419,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -518,12 +419,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(cardLabel) centerView.addSubview(cardLabel)
cardLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(cerSignPlaceView.snp.bottom).offset(24)
make.height.equalTo(20)
}
cardBeginView = { cardBeginView = {
let view = YHItemView() let view = YHItemView()
let line = UIView() let line = UIView()
...@@ -542,13 +437,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -542,13 +437,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(cardBeginView) centerView.addSubview(cardBeginView)
cardBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cardEndView = { cardEndView = {
let view = YHItemView() let view = YHItemView()
let line = UIView() let line = UIView()
...@@ -574,12 +462,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -574,12 +462,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(cardEndView) centerView.addSubview(cardEndView)
cardEndView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardBeginView.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
// 【签注有效期 UI】 // 【签注有效期 UI】
signLabel = { signLabel = {
...@@ -590,12 +472,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -590,12 +472,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(signLabel) centerView.addSubview(signLabel)
signLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardEndView.snp.bottom).offset(24)
make.height.equalTo(20)
make.right.equalTo(-18)
}
signBeginView = { signBeginView = {
let view = YHItemView() let view = YHItemView()
...@@ -615,12 +491,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -615,12 +491,6 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(signBeginView) centerView.addSubview(signBeginView)
signBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(signLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
signEndView = { signEndView = {
let view = YHItemView() let view = YHItemView()
...@@ -640,6 +510,151 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -640,6 +510,151 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(signEndView) centerView.addSubview(signEndView)
makeConstraints()
}
func makeConstraints() {
centerView.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(0)
make.bottom.equalTo(0)
}
titleLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(16)
make.height.equalTo(20)
}
exampleButton.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(8)
make.centerY.equalTo(titleLabel.snp.centerY)
make.height.equalTo(16)
make.width.equalTo(48)
}
let lineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(lineView)
lineView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(52)
make.height.equalTo(1)
}
frontLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
backSurfaceLabel.snp.makeConstraints { make in
make.right.equalTo(-18)
make.left.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
frontImageButton.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(102)
make.height.equalTo(91)
make.width.equalTo(CGFloat(147).fix)
}
frontDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(frontImageButton.snp.right)
make.centerY.equalTo(frontImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
backSurfaceImageButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(102)
make.height.equalTo(91)
make.width.equalTo(CGFloat(147).fix)
}
backSurfaceDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(backSurfaceImageButton.snp.right)
make.centerY.equalTo(backSurfaceImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
activityIndicator.snp.makeConstraints { make in
make.center.equalTo(backSurfaceImageButton.snp.center)
make.height.equalTo(25)
make.width.equalTo(25)
}
showMessageLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(201)
make.height.equalTo(20)
}
cerInfoLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(229)
make.height.equalTo(20)
}
cerNumberView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cerInfoLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cerSignPlaceView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cerNumberView.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cardLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(cerSignPlaceView.snp.bottom).offset(24)
make.height.equalTo(20)
}
cardBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cardEndView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardBeginView.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
signLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardEndView.snp.bottom).offset(24)
make.height.equalTo(20)
make.right.equalTo(-18)
}
signBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(signLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
centerView.addSubview(signEndView)
signEndView.snp.makeConstraints { make in signEndView.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
make.top.equalTo(signBeginView.snp.bottom) make.top.equalTo(signBeginView.snp.bottom)
......
...@@ -226,12 +226,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -226,12 +226,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
}() }()
contentView.addSubview(centerView) contentView.addSubview(centerView)
centerView.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(0)
make.bottom.equalTo(0)
}
titleLabel = { titleLabel = {
let label = UILabel() let label = UILabel()
...@@ -247,11 +241,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -247,11 +241,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(titleLabel) centerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(16)
make.height.equalTo(20)
}
exampleButton = { exampleButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
...@@ -265,24 +254,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -265,24 +254,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(exampleButton) centerView.addSubview(exampleButton)
exampleButton.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(8)
make.centerY.equalTo(titleLabel.snp.centerY)
make.height.equalTo(14)
make.width.equalTo(48)
}
let lineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(lineView)
lineView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(52)
make.height.equalTo(1)
}
frontLabel = { frontLabel = {
let label = UILabel() let label = UILabel()
...@@ -293,12 +264,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -293,12 +264,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(frontLabel) centerView.addSubview(frontLabel)
frontLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
backSurfaceLabel = { backSurfaceLabel = {
let label = UILabel() let label = UILabel()
...@@ -309,12 +274,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -309,12 +274,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(backSurfaceLabel) centerView.addSubview(backSurfaceLabel)
backSurfaceLabel.snp.makeConstraints { make in
make.right.equalTo(-18)
make.left.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
frontImageButton = { frontImageButton = {
let button = YHCardButton() let button = YHCardButton()
...@@ -326,12 +285,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -326,12 +285,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(frontImageButton) centerView.addSubview(frontImageButton)
frontImageButton.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(102)
make.height.equalTo(90)
make.width.equalTo(CGFloat(147).fix)
}
frontDeleteButton = { frontDeleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
...@@ -341,12 +294,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -341,12 +294,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(frontDeleteButton) centerView.addSubview(frontDeleteButton)
frontDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(frontImageButton.snp.right)
make.centerY.equalTo(frontImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
backSurfaceImageButton = { backSurfaceImageButton = {
let button = YHCardButton() let button = YHCardButton()
...@@ -358,12 +305,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -358,12 +305,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(backSurfaceImageButton) centerView.addSubview(backSurfaceImageButton)
backSurfaceImageButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(102)
make.height.equalTo(90)
make.width.equalTo(CGFloat(147).fix)
}
backSurfaceDeleteButton = { backSurfaceDeleteButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
...@@ -373,12 +314,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -373,12 +314,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return button return button
}() }()
centerView.addSubview(backSurfaceDeleteButton) centerView.addSubview(backSurfaceDeleteButton)
backSurfaceDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(backSurfaceImageButton.snp.right)
make.centerY.equalTo(backSurfaceImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
activityIndicator = { activityIndicator = {
let view = UIActivityIndicatorView() let view = UIActivityIndicatorView()
...@@ -386,11 +321,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -386,11 +321,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return view return view
}() }()
centerView.addSubview(activityIndicator) centerView.addSubview(activityIndicator)
activityIndicator.snp.makeConstraints { make in
make.center.equalTo(backSurfaceImageButton.snp.center)
make.height.equalTo(25)
make.width.equalTo(25)
}
showMessageLabel = { showMessageLabel = {
let label = UILabel() let label = UILabel()
...@@ -400,12 +330,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -400,12 +330,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(showMessageLabel) centerView.addSubview(showMessageLabel)
showMessageLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(201)
make.height.equalTo(20)
}
cardLabel = { cardLabel = {
let label = UILabel() let label = UILabel()
...@@ -415,12 +339,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -415,12 +339,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(cardLabel) centerView.addSubview(cardLabel)
cardLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(229)
make.height.equalTo(20)
}
cardBeginView = { cardBeginView = {
let view = YHItemView() let view = YHItemView()
let line = UIView() let line = UIView()
...@@ -439,12 +357,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -439,12 +357,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(cardBeginView) centerView.addSubview(cardBeginView)
cardBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cardEndView = { cardEndView = {
let view = YHItemView() let view = YHItemView()
...@@ -464,12 +376,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -464,12 +376,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(cardEndView) centerView.addSubview(cardEndView)
cardEndView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardBeginView.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
signLabel = { signLabel = {
let label = UILabel() let label = UILabel()
...@@ -479,13 +385,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -479,13 +385,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
return label return label
}() }()
centerView.addSubview(signLabel) centerView.addSubview(signLabel)
signLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardEndView.snp.bottom).offset(24)
make.height.equalTo(20)
make.right.equalTo(-18)
}
signBeginView = { signBeginView = {
let view = YHItemView() let view = YHItemView()
let line = UIView() let line = UIView()
...@@ -504,12 +403,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -504,12 +403,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(signBeginView) centerView.addSubview(signBeginView)
signBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(signLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
signEndView = { signEndView = {
let view = YHItemView() let view = YHItemView()
...@@ -529,6 +422,132 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell { ...@@ -529,6 +422,132 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
} }
} }
centerView.addSubview(signEndView) centerView.addSubview(signEndView)
makeConstraint()
}
func makeConstraint() {
centerView.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(0)
make.bottom.equalTo(0)
}
titleLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(16)
make.height.equalTo(20)
}
exampleButton.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(8)
make.centerY.equalTo(titleLabel.snp.centerY)
make.height.equalTo(14)
make.width.equalTo(48)
}
let lineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(lineView)
lineView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(52)
make.height.equalTo(1)
}
frontLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
backSurfaceLabel.snp.makeConstraints { make in
make.right.equalTo(-18)
make.left.equalTo(self.snp.centerX)
make.top.equalTo(70)
make.height.equalTo(20)
}
frontImageButton.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(102)
make.height.equalTo(90)
make.width.equalTo(CGFloat(147).fix)
}
frontDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(frontImageButton.snp.right)
make.centerY.equalTo(frontImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
backSurfaceImageButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(102)
make.height.equalTo(90)
make.width.equalTo(CGFloat(147).fix)
}
backSurfaceDeleteButton.snp.makeConstraints { make in
make.centerX.equalTo(backSurfaceImageButton.snp.right)
make.centerY.equalTo(backSurfaceImageButton.snp.top)
make.height.equalTo(21)
make.width.equalTo(21)
}
activityIndicator.snp.makeConstraints { make in
make.center.equalTo(backSurfaceImageButton.snp.center)
make.height.equalTo(25)
make.width.equalTo(25)
}
showMessageLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(201)
make.height.equalTo(20)
}
cardLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.right.equalTo(-18)
make.top.equalTo(229)
make.height.equalTo(20)
}
cardBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
cardEndView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardBeginView.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
signLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(cardEndView.snp.bottom).offset(24)
make.height.equalTo(20)
make.right.equalTo(-18)
}
signBeginView.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(signLabel.snp.bottom)
make.height.equalTo(52)
make.right.equalTo(-18)
}
signEndView.snp.makeConstraints { make in signEndView.snp.makeConstraints { make in
make.left.equalTo(18) make.left.equalTo(18)
make.top.equalTo(signBeginView.snp.bottom) make.top.equalTo(signBeginView.snp.bottom)
......
...@@ -343,6 +343,8 @@ class YHCompanySelectFileCell: UITableViewCell { ...@@ -343,6 +343,8 @@ class YHCompanySelectFileCell: UITableViewCell {
} }
// swiftlint:disable function_body_length
// swiftlint:disable cyclomatic_complexity
func updateAllViews() { func updateAllViews() {
mainItemView.removeSubviews() mainItemView.removeSubviews()
for j in 0..<messageDataSource.count { for j in 0..<messageDataSource.count {
...@@ -697,6 +699,8 @@ class YHCompanySelectFileCell: UITableViewCell { ...@@ -697,6 +699,8 @@ class YHCompanySelectFileCell: UITableViewCell {
} }
} }
} }
// swiftlint:enable function_body_length
// swiftlint:enable cyclomatic_complexity
@objc func agreeClick(sender: UIButton) { @objc func agreeClick(sender: UIButton) {
if (model.has_ipo_company_equity == 1 && model.is_ipo_company == 1 && model.has_ipo_sales_reached == 1)||(model.has_company_equity == 1 && model.is_ipo_company == 2 && model.has_sales_reached == 1) { if (model.has_ipo_company_equity == 1 && model.is_ipo_company == 1 && model.has_ipo_sales_reached == 1)||(model.has_company_equity == 1 && model.is_ipo_company == 2 && model.has_sales_reached == 1) {
......
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