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

代码修改

parent dc641853
......@@ -33,6 +33,7 @@ platform :ios do
sc_105_branch = "sc-1.0.5"
main_fix = "main-fix"
jiaofei = "jiaofei"
jiaofei = "jiaofei"
#打包正使用的分支
myPack_branch = develop_branch
......
......@@ -6,13 +6,13 @@
// Copyright © 2024 www.davidhuang.com. All rights reserved.
//
import UIKit
import Alamofire
import SmartCodable
import UIKit
class YHSmallWhiteBarInfo: SmartCodable {
var start_time: String = ""// 开始时间
var end_time: String = ""// 结束时间
var start_time: String = "" // 开始时间
var end_time: String = "" // 结束时间
required init() {
}
}
......@@ -38,12 +38,13 @@ class YHCardOcrModel: SmartCodable {
}
class YHBaseViewModel {
// MARK: 属性
// 小白条信息
var smallWhiteBarInfo: YHSmallWhiteBarInfo?
// MARK: 接口
// 3、ocr识别 中国身份证 正/反面
func getChinaCardInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn
......@@ -130,7 +131,6 @@ class YHBaseViewModel {
YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(false, errorModel)
return
}
return
}
......@@ -161,22 +161,21 @@ class YHBaseViewModel {
// 图片上传
func uploadImage(_ image: UIImage, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) {
// #if DEBUG
// #if DEBUG
// let size = image.imageSize()
// YHHUD.flash(message: "\(Float(size/1024/1024))M")
// #endif
// #endif
if YHNetworkStatusManager.shared.isNetWorkOK == false {
DispatchQueue.main.async {
YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(nil, errorModel)
return
}
return
}
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 }
DispatchQueue.main.async {
// 在这里执行需要在主线程上完成的任务
......@@ -193,7 +192,6 @@ class YHBaseViewModel {
YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(nil, errorModel)
return
}
return
}
......@@ -210,18 +208,16 @@ class YHBaseViewModel {
// 上传方法
func uploadFile(_ url: String, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) {
if YHNetworkStatusManager.shared.isNetWorkOK == false {
DispatchQueue.main.async {
YHHUD.flash(message: "网络不可用,请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用,请检查网络设置")
callBackBlock(nil, errorModel)
return
}
return
}
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 }
DispatchQueue.main.async {
// 在这里执行需要在主线程上完成的任务
......@@ -238,7 +234,7 @@ class YHBaseViewModel {
return
}
let task = URLSession.shared.dataTask(with: urlToGo) {
(_, response, error) in
_, response, error in
if error != nil {
// url 不可用
callback(false)
......@@ -264,7 +260,7 @@ class YHBaseViewModel {
// 传入的url无论是公链还是私链 最后返回一个可用链(私转公失败会返回空)
func getRealUsefulUrl(_ url: String, callback: @escaping (String) -> Void) {
// 判断url是否可以直接访问
self.checkUrlIsDirectAccess(url) {
checkUrlIsDirectAccess(url) {
isAccess in
if isAccess {
......
......@@ -422,6 +422,8 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
return 3
}
// swiftlint:disable function_body_length
// swiftlint:disable cyclomatic_complexity
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if stepView.currentIndex == 0 {
let cell = tableView.dequeueReusableCell(withClass: YHDocumentMessageTableViewCell.self)
......@@ -488,23 +490,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
emailInputView.textField.becomeFirstResponder()
}
}.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
......@@ -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 {
if stepView.currentIndex == 0 {
......
......@@ -343,6 +343,8 @@ class YHCompanySelectFileCell: UITableViewCell {
}
// swiftlint:disable function_body_length
// swiftlint:disable cyclomatic_complexity
func updateAllViews() {
mainItemView.removeSubviews()
for j in 0..<messageDataSource.count {
......@@ -697,6 +699,8 @@ class YHCompanySelectFileCell: UITableViewCell {
}
}
}
// swiftlint:enable function_body_length
// swiftlint:enable cyclomatic_complexity
@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) {
......
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