Skip to content

G
galaxy-iOS
Commit 46688dd5 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

代码修改

parent dc641853
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 50 deletions
galaxy/fastlane/Fastfile
View file @ 46688dd5
......@@ -33,7 +33,8 @@ platform :ios do
sc_105_branch = "sc-1.0.5"
main_fix = "main-fix"
jiaofei = "jiaofei"
jiaofei = "jiaofei"
#打包正使用的分支
myPack_branch = develop_branch
......
galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift
View file @ 46688dd5
......@@ -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() {
}
}
......@@ -32,23 +32,24 @@ class YHCardOcrModel: SmartCodable {
var back_end_of_term: String = ""
var back_hk_type: String = ""
var back_round_trip_number: String = ""
required init() {
}
}
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
let params: [String: Any] = ["url": url,
"is_back": isBack]
"is_back": isBack]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象
guard self != nil else {
......@@ -69,12 +70,12 @@ class YHBaseViewModel {
callBackBlock(false, nil)
}
}
// 2.2、ocr识别 港澳通行证 背面
func getHKCardBackInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OCR.hkmacowBackInfoApi
let params: [String: Any] = ["url": url,
"is_back": isBack]
"is_back": isBack]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象
guard self != nil else {
......@@ -86,7 +87,7 @@ class YHBaseViewModel {
callBackBlock(false, nil)
return
}
callBackBlock(true, result)
} else {
let _: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
......@@ -96,12 +97,12 @@ class YHBaseViewModel {
callBackBlock(false, nil)
}
}
// 2、ocr识别 港澳通行证 正面
func getHKCardInfoByOcr(_ url: String, isBack: Int, callBackBlock: @escaping (_ success: Bool, _ model: YHCardOcrModel?) -> Void) {
let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk
let params: [String: Any] = ["url": url,
"is_back": isBack]
"is_back": isBack]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
// 1. json字符串 转 对象
guard self != nil else {
......@@ -122,7 +123,7 @@ class YHBaseViewModel {
callBackBlock(false, nil)
}
}
// 1、ocr获取小白条信息
func getSmallWhiteBarInfoByOcr(_ url: String, callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
if YHNetworkStatusManager.shared.isNetWorkOK == false {
......@@ -130,11 +131,10 @@ class YHBaseViewModel {
YHHUD.flash(message: "网络不可用，请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用，请检查网络设置")
callBackBlock(false, errorModel)
return
}
return
}
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OCR.smallWhiteBarApi
let params: [String: Any] = ["url": url]
_ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, _ in
......@@ -158,25 +158,24 @@ class YHBaseViewModel {
callBackBlock(false, err)
}
}
// 图片上传
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 {
// 在这里执行需要在主线程上完成的任务
......@@ -185,7 +184,7 @@ class YHBaseViewModel {
}
}
}
// 获取公链URL
func getPublicImageUrl(_ url: String, _ isPublic: Bool = false, callBackBlock: @escaping (_ success: String?, _ error: YHErrorModel?) -> Void) {
if YHNetworkStatusManager.shared.isNetWorkOK == false {
......@@ -193,7 +192,6 @@ class YHBaseViewModel {
YHHUD.flash(message: "网络不可用，请检查网络设置")
let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络不可用，请检查网络设置")
callBackBlock(nil, errorModel)
return
}
return
}
......@@ -207,21 +205,19 @@ 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 {
// 在这里执行需要在主线程上完成的任务
......@@ -230,7 +226,7 @@ class YHBaseViewModel {
})
}
}
// 验证url是否可直接访问
func checkUrlIsDirectAccess(_ url: String, callback: @escaping (Bool) -> Void) {
guard !url.isEmpty, let urlToGo = URL(string: url) else {
......@@ -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)
......@@ -252,7 +248,7 @@ class YHBaseViewModel {
if httpResponse.statusCode == 200 {
// url可用
callback(true)
} else {
// url 不可用
callback(false)
......@@ -260,13 +256,13 @@ class YHBaseViewModel {
}
task.resume()
}
// 传入的url无论是公链还是私链 最后返回一个可用链(私转公失败会返回空)
func getRealUsefulUrl(_ url: String, callback: @escaping (String) -> Void) {
// 判断url是否可以直接访问
self.checkUrlIsDirectAccess(url) {
checkUrlIsDirectAccess(url) {
isAccess in
if isAccess {
// url能直接访问
DispatchQueue.main.async {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ 46688dd5
......@@ -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 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceCompanySelectView.swift
View file @ 46688dd5
......@@ -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