Skip to content

G
galaxy-iOS
Commit 824d22bf authored by David黄金龙's avatar David黄金龙
Browse files
Options

方案计划 接口联调

parent aa2a99d2
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 28 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 824d22bf
......@@ -258,6 +258,8 @@
A5573EF52B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */; };
A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */; };
A57F1F252B48F09200B644E6 /* ATAuthSDK_D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04808C032B4686510056D53C /* ATAuthSDK_D.framework */; };
A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */; };
A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift */; };
A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A58951C42B398D1000225C19 /* Launch Screen.storyboard */; };
A58A8C8F2BA6978100632765 /* YHMineCertificateEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */; };
......@@ -646,6 +648,8 @@
A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITests.swift; sourceTree = "<group>"; };
A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITestsLaunchTests.swift; sourceTree = "<group>"; };
A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
A58556B92B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoFillStepModel.swift; sourceTree = "<group>"; };
A58951C42B398D1000225C19 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
A58A8C8E2BA6978100632765 /* YHMineCertificateEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineCertificateEntryViewController.swift; sourceTree = "<group>"; };
......@@ -803,6 +807,7 @@
isa = PBXGroup;
children = (
0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */,
A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */,
);
path = Model;
sourceTree = "<group>";
......@@ -1564,6 +1569,7 @@
A525D22A2BA836D6001A84F5 /* MyScheme(我的方案) */ = {
isa = PBXGroup;
children = (
A580371C2BAD77DB0031C312 /* VM */,
0425E63E2BA9355F00A5E763 /* Model */,
0425E63B2BA931B300A5E763 /* View */,
A525D22B2BA8370F001A84F5 /* C */,
......@@ -1648,6 +1654,14 @@
path = galaxyUITests;
sourceTree = "<group>";
};
A580371C2BAD77DB0031C312 /* VM */ = {
isa = PBXGroup;
children = (
A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
A58A8C902BA6C40A00632765 /* VM */ = {
isa = PBXGroup;
children = (
......@@ -2496,10 +2510,12 @@
045EEE8B2B9F171A0022A143 /* YHPreviewMainApplicantInfoViewController.swift in Sources */,
045EEE922B9F171A0022A143 /* YHPreviewInfoNameAndSubNameItemView.swift in Sources */,
045EEEF92B9F171A0022A143 /* YHFormItemTitleCell.swift in Sources */,
A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */,
0425E6482BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift in Sources */,
04A271252BAC33BB00652B1B /* YHFilePreviewTool.swift in Sources */,
045EEEC32B9F171A0022A143 /* YHOtherResidenceFillView.swift in Sources */,
045EEE792B9F171A0022A143 /* YHPreviewViewModel.swift in Sources */,
A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */,
0493B3DE2BA80C2300AF9393 /* YHCertificateFilterButton.swift in Sources */,
045EEE822B9F171A0022A143 /* YHPersonInfoIdentityCardModel.swift in Sources */,
045EEE952B9F171A0022A143 /* YHPreviewInfoCertificateInformationItemsView.swift in Sources */,
......
galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift
View file @ 824d22bf
......@@ -8,7 +8,7 @@
import UIKit
import Alamofire
import SmartCodable
//import SmartCodable
class YHBaseViewModel {
// 上传方法
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/C/YHMineSchemeViewController.swift
View file @ 824d22bf
......@@ -17,6 +17,16 @@ class YHMineSchemeViewController: YHBaseViewController {
var tableView: UITableView!
var dataSource: [YHScemeItemModel]? = []
lazy var reqSchemeVM : YHMySchemeViewModel = {
let vm = YHMySchemeViewModel()
return vm
}()
lazy var headView : YHSchemeTableHeadView = {
let headView = YHSchemeTableHeadView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 511))
return headView
}()
override func viewDidLoad() {
super.viewDidLoad()
gk_navTitle = "我的方案"
......@@ -26,9 +36,40 @@ class YHMineSchemeViewController: YHBaseViewController {
gk_backImage = UIImage(named: "nav_icon_back")
setView()
getData()
// Do any additional setup after loading the view.
loadData()
}
}
extension YHMineSchemeViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return dataSource?.count ?? 0
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHSchemeTableViewCell.self)
cell.dataSource = dataSource?[indexPath.row]
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 0 {
return 199
}
if indexPath.row == 1 {
return 251
}
if indexPath.row == 2 {
return 190
}
return 0
}
}
extension YHMineSchemeViewController {
func getData() {
let model1 = YHScemeItemModel(title: "行业定位", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：其他（环境科学、HSE）", lightMessage: "其他（环境科学、HSE）", subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。")
let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "(1)港澳通如未办理，请尽快办理好反馈过来；\n(2)如为国内学校，需要尽快办理学位认证报告；\n(3)如为海外学校，需提供成绩单副本")
......@@ -53,9 +94,8 @@ class YHMineSchemeViewController: YHBaseViewController {
tableView.delegate = self
tableView.dataSource = self
tableView.tableFooterView = YHSchemeTableFooterView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 112))
let head = YHSchemeTableHeadView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 511))
head.dataSource = YHScemeHeadModel(totalScore: "100", scoreArray: ["年龄30分","学历30分","工作经验加分15分","语言加分15分","家庭背景加分10分"], scoreLightArray: ["30","30","15","15","10"], addScore: "", name: "黄金龙")
tableView.tableHeaderView = head
tableView.tableHeaderView = headView
tableView.register(cellWithClass: YHSchemeTableViewCell.self)
tableView.bounces = false
return tableView
......@@ -66,31 +106,20 @@ class YHMineSchemeViewController: YHBaseViewController {
make.left.right.bottom.equalToSuperview()
}
}
}
extension YHMineSchemeViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return dataSource?.count ?? 0
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHSchemeTableViewCell.self)
cell.dataSource = dataSource?[indexPath.row]
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 0 {
return 199
}
if indexPath.row == 1 {
return 251
}
if indexPath.row == 2 {
return 190
func loadData() {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
let param = ["order_id":orderID]
reqSchemeVM.getMySchemeData(params: param) { success, error in
if success == true {
self.headView.dataSource = YHScemeHeadModel(totalScore: "100", scoreArray: ["年龄30分","学历30分","工作经验加分15分","语言加分15分","家庭背景加分10分"], scoreLightArray: ["30","30","15","15","10"], addScore: "", name: "黄金龙")
} else {
YHHUD.flash(message: error?.errorMsg ?? "请求出错")
}
}
} else {
printLog("error : orderID 为空")
}
return 0
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/Model/YHMySchemeModel.swift 0 → 100644
View file @ 824d22bf
//
// YHMySchemeModel.swift
// galaxy
//
// Created by davidhuangA on 2024/3/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
class YHMySchemeModel: SmartCodable {
var age_score : Int = 0
var background_score : Int = 0
var education_score_a : Int = 0
var education_score_b : Int = 0
var famous_enterprise : Int = 0
var industry : String = ""
var language_score : Int = 0
var sum_score : Int = 0
var username : String = ""
var work_experience_score : Int = 0
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/VM/YHMySchemeViewModel.swift 0 → 100644
View file @ 824d22bf
//
// YHMySchemeViewModel.swift
// galaxy
//
// Created by davidhuangA on 2024/3/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHMySchemeViewModel: YHBaseViewModel {
var schemeModel : YHMySchemeModel?
//我的方案
func getMySchemeData( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Assessment.applyPlanApi
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHMySchemeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
return
}
self.schemeModel = resultModel
callBackBlock(true,nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
callBackBlock(false,err)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 824d22bf
......@@ -211,4 +211,10 @@ class YHAllApiName {
//获取问答列表
static let questionAndAnswerApi = "infoflow/answer-question/getAnswerQuestion"
}
// 我的方案
struct Assessment {
//方案计划
static let applyPlanApi = "infoflow/assessment/apply_plan"
}
}
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