Skip to content

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

bug 处理

parent 97495372
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 23 deletions
galaxy/Podfile
View file @ 4515b4ec
...@@ -89,6 +89,8 @@ target 'galaxy' do ...@@ -89,6 +89,8 @@ target 'galaxy' do
pod 'AttributedString','3.3.5' pod 'AttributedString','3.3.5'
#json转模型 #json转模型
pod 'HandyJSON', '5.0.2' pod 'HandyJSON', '5.0.2'
#截图
pod 'DDGScreenShot', '1.1.6'
end end
......
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 4515b4ec
...@@ -2727,7 +2727,7 @@ ...@@ -2727,7 +2727,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -2769,7 +2769,7 @@ ...@@ -2769,7 +2769,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift
View file @ 4515b4ec
...@@ -72,8 +72,8 @@ extension YHFileListViewController { ...@@ -72,8 +72,8 @@ extension YHFileListViewController {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") { if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
YHHUD.show(.progress(message: "")) YHHUD.show(.progress(message: ""))
let tttt = "11758" //for test hjl // let tttt = "11758" //for test hjl
let param = ["order_id":tttt,"node":"1","state":"1"] let param = ["order_id":orderID,"node":"1","state":"1"]
certificateReqVM.getCertificateFileListData(params: param) { success, error in certificateReqVM.getCertificateFileListData(params: param) { success, error in
YHHUD.hide() YHHUD.hide()
if success == true { if success == true {
...@@ -119,11 +119,11 @@ extension YHFileListViewController { ...@@ -119,11 +119,11 @@ extension YHFileListViewController {
bottomView.block = { [self] flag in bottomView.block = { [self] flag in
if flag == 1 { if flag == 1 {
printLog("生成清单") printLog("生成清单")
if let image = self.captureScrollView(scrollView: self.myScrollView) { // if let image = self.captureScrollView(scrollView: self.myScrollView) {
saveImageToPhotosAlbum(image: image) // saveImageToPhotosAlbum(image: image)
} else { // } else {
YHHUD.flash(message: "截图失败~~~") // YHHUD.flash(message: "截图失败~~~")
} // }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryCell.swift
View file @ 4515b4ec
...@@ -59,7 +59,7 @@ extension YHCertificateEntryCell { ...@@ -59,7 +59,7 @@ extension YHCertificateEntryCell {
var title = "" var title = ""
var color : UIColor = .failColor var color : UIColor = .failColor
if dataModel.checkStatus == 0 { if dataModel.checkStatus == 0 {
title = "未审核" title = "审核中"
color = UIColor.labelTextColor2 color = UIColor.labelTextColor2
} else if dataModel.checkStatus == 1 { } else if dataModel.checkStatus == 1 {
title = "已完成" title = "已完成"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/C/YHMineSchemeViewController.swift
View file @ 4515b4ec
...@@ -35,8 +35,6 @@ class YHMineSchemeViewController: YHBaseViewController { ...@@ -35,8 +35,6 @@ class YHMineSchemeViewController: YHBaseViewController {
gk_navBackgroundImage = UIImage(named: "my_scheme_nav") gk_navBackgroundImage = UIImage(named: "my_scheme_nav")
gk_backImage = UIImage(named: "nav_icon_back") gk_backImage = UIImage(named: "nav_icon_back")
setView() setView()
getData()
loadData() loadData()
} }
} }
...@@ -67,7 +65,7 @@ extension YHMineSchemeViewController: UITableViewDelegate, UITableViewDataSource ...@@ -67,7 +65,7 @@ extension YHMineSchemeViewController: UITableViewDelegate, UITableViewDataSource
extension YHMineSchemeViewController { extension YHMineSchemeViewController {
func getData() { func getData() {
let model1 = YHScemeItemModel(title: "行业定位", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：其他（环境科学、HSE）", lightMessage: "其他（环境科学、HSE）", subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。") let model1 = YHScemeItemModel(title: "行业定位", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：--", lightMessage: "--", subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。")
let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "(1)港澳通如未办理，请尽快办理好反馈过来；\n(2)如为国内学校，需要尽快办理学位认证报告；\n(3)如为海外学校，需提供成绩单副本") let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "(1)港澳通如未办理，请尽快办理好反馈过来；\n(2)如为国内学校，需要尽快办理学位认证报告；\n(3)如为海外学校，需提供成绩单副本")
let model3 = YHScemeItemModel(title: "文书清单", buttonTitle: "文书写作", mainMessage: "这是您的文书清单，包括推荐信、赴港计划书，我写好后会发在微信里，与您一起沟通进行哈。3周-4周左右完成，需要咱们共同配合完成的噢", lightMessage: "3周-4周") let model3 = YHScemeItemModel(title: "文书清单", buttonTitle: "文书写作", mainMessage: "这是您的文书清单，包括推荐信、赴港计划书，我写好后会发在微信里，与您一起沟通进行哈。3周-4周左右完成，需要咱们共同配合完成的噢", lightMessage: "3周-4周")
dataSource = [model1, model2, model3] dataSource = [model1, model2, model3]
...@@ -111,16 +109,32 @@ extension YHMineSchemeViewController { ...@@ -111,16 +109,32 @@ extension YHMineSchemeViewController {
if success == true { if success == true {
guard let model = self.reqSchemeVM.schemeModel else { return } guard let model = self.reqSchemeVM.schemeModel else { return }
let industry = model.industry.defaultStringIfEmpty()
let model1 = YHScemeItemModel(title: "行业定位", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：" + industry, lightMessage: industry, subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。")
let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "(1)港澳通如未办理，请尽快办理好反馈过来；\n(2)如为国内学校，需要尽快办理学位认证报告；\n(3)如为海外学校，需提供成绩单副本")
let model3 = YHScemeItemModel(title: "文书清单", buttonTitle: "文书写作", mainMessage: "这是您的文书清单，包括推荐信、赴港计划书，我写好后会发在微信里，与您一起沟通进行哈。3周-4周左右完成，需要咱们共同配合完成的噢", lightMessage: "3周-4周")
self.dataSource = [model1, model2, model3]
self.tableView.reloadData()
let ageTxt = "年龄" + model.age_score.string + "分" let ageTxt = "年龄" + model.age_score.string + "分"
let eduTxtA = "学历" + model.education_score_a.string + "分" let eduTxtA = "学历" + model.education_score_a.string + "分，名校加分XX分"
let workExp = "工作经验加分" + model.work_experience_score.string + "分" let workExp = "工作经验加分" + model.work_experience_score.string + "分"
let famous_enterprise = "名企加分" + model.famous_enterprise.string + "分"
let talent_list = "人才清单加分" + model.talent_list.string + "分"
let language = "语言加分" + model.language_score.string + "分" let language = "语言加分" + model.language_score.string + "分"
let family = "家庭背景加分" + model.background_score.string + "分" let family = "家庭背景加分" + model.background_score.string + "分"
var arrText : [String] = [ageTxt,eduTxtA,workExp,language,family] let arrText : [String] = [ageTxt,eduTxtA,workExp,famous_enterprise,talent_list,language,family]
var arrH : [String] = [model.age_score.string,model.education_score_a.string,model.work_experience_score.string,model.language_score.string,model.background_score.string] let arrH : [String] = [model.age_score.string,model.education_score_a.string,model.work_experience_score.string,model.famous_enterprise.string,model.talent_list.string,model.language_score.string,model.background_score.string]
self.headView.dataSource = YHScemeHeadModel(totalScore: model.sum_score.string, scoreArray: arrText, scoreLightArray: arrH, addScore: "", name: model.username.defaultStringIfEmpty()) self.headView.dataSource = YHScemeHeadModel(totalScore: model.sum_score.string, scoreArray: arrText, scoreLightArray: arrH, addScore: "", name: model.username.defaultStringIfEmpty(),addtionStr: model.education_score_b.string)
} else { } else {
YHHUD.flash(message: error?.errorMsg ?? "请求出错") YHHUD.flash(message: error?.errorMsg ?? "请求出错")
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/Model/YHScemeItemModel.swift
View file @ 4515b4ec
...@@ -22,4 +22,5 @@ struct YHScemeHeadModel { ...@@ -22,4 +22,5 @@ struct YHScemeHeadModel {
var scoreLightArray: [String] = [] var scoreLightArray: [String] = []
var addScore: String = "" var addScore: String = ""
var name: String = "" var name: String = ""
var addtionStr : String = ""
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeHeadScoreItemView.swift
View file @ 4515b4ec
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
import UIKit import UIKit
import AttributedString
class YHSchemeHeadScoreItemView: UIView { class YHSchemeHeadScoreItemView: UIView {
var titleLabel: UILabel! var titleLabel: UILabel!
...@@ -46,8 +47,24 @@ class YHSchemeHeadScoreItemView: UIView { ...@@ -46,8 +47,24 @@ class YHSchemeHeadScoreItemView: UIView {
} }
} }
func setContent(_ message: String, _ light: String) { func setContent(_ message: String, _ light: String,_ addtionStr: String) {
let newString: NSAttributedString = message.highlighted(keyWords: light, highlightColor: UIColor(hex: 0xd48638)) if message.contains("名校加分") {
titleLabel.attributedText = newString
let a: ASAttributedString = .init("学历", .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
let aa: ASAttributedString = .init(NSAttributedString(string: light), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let b: ASAttributedString = .init("分，名校加分", .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init(NSAttributedString(string: addtionStr), .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
let bbb: ASAttributedString = .init("分", .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = a + aa + b + bb + bbb
} else {
let newString: NSAttributedString = message.highlighted(keyWords: light, highlightColor: UIColor.warnColor)
titleLabel.attributedText = newString
}
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeTableHeadView.swift
View file @ 4515b4ec
...@@ -221,7 +221,7 @@ class YHSchemeTableHeadView: UIView { ...@@ -221,7 +221,7 @@ class YHSchemeTableHeadView: UIView {
let string = model.scoreArray[i] let string = model.scoreArray[i]
let light = model.scoreLightArray[i] let light = model.scoreLightArray[i]
let view = YHSchemeHeadScoreItemView() let view = YHSchemeHeadScoreItemView()
view.setContent(string, light) view.setContent(string, light,model.addtionStr)
scoreItemView.addSubview(view) scoreItemView.addSubview(view)
view.snp.makeConstraints { make in view.snp.makeConstraints { make in
make.top.equalTo(i * 28) make.top.equalTo(i * 28)
......
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ 4515b4ec
...@@ -28,7 +28,7 @@ class YHBaseUrlManager { ...@@ -28,7 +28,7 @@ class YHBaseUrlManager {
// MARK: - 当前使用的url // MARK: - 当前使用的url
func curURL() -> String { func curURL() -> String {
// return YHBaseUrlManager.baseUrlRelease //for test hjl return YHBaseUrlManager.baseUrlTest //for test hjl
#if DEBUG #if DEBUG
return YHBaseUrlManager.baseUrlTest return YHBaseUrlManager.baseUrlTest
#else #else
...@@ -37,7 +37,7 @@ class YHBaseUrlManager { ...@@ -37,7 +37,7 @@ class YHBaseUrlManager {
} }
func curOssURL() -> String { func curOssURL() -> String {
// return YHBaseUrlManager.baseOSSUrlRelease //for test hjl return YHBaseUrlManager.baseUrlTest //for test hjl
#if DEBUG #if DEBUG
return YHBaseUrlManager.baseOSSUrlTest return YHBaseUrlManager.baseOSSUrlTest
#else #else
......
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