Commit 0e3ff4c1 authored by David黄金龙's avatar David黄金龙

1、修改版本号 0.1.6

2、我的积分
parent 3b3cf36d
...@@ -2264,7 +2264,7 @@ ...@@ -2264,7 +2264,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 = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -2284,7 +2284,7 @@ ...@@ -2284,7 +2284,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.1.5; MARKETING_VERSION = 0.1.6;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
...@@ -2306,7 +2306,7 @@ ...@@ -2306,7 +2306,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 = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -2326,7 +2326,7 @@ ...@@ -2326,7 +2326,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.1.5; MARKETING_VERSION = 0.1.6;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
......
...@@ -60,7 +60,7 @@ class YHScoreSessionModel : SmartCodable { ...@@ -60,7 +60,7 @@ class YHScoreSessionModel : SmartCodable {
if model.answer.isEmpty == true { if model.answer.isEmpty == true {
item.isSelected = false item.isSelected = false
} else { } else {
if model.answer.contains(index+1) { if model.answer.contains(String(index+1)) {
item.isSelected = true item.isSelected = true
continue continue
} }
......
...@@ -11,6 +11,6 @@ import SmartCodable ...@@ -11,6 +11,6 @@ import SmartCodable
struct YHScoreResultBaseModel: SmartCodable { struct YHScoreResultBaseModel: SmartCodable {
var result : String = "" var result : String = ""
var answer : [Int] = [] var answer : [String] = []
var score : Int = 0 var score : Int = 0
} }
...@@ -18,7 +18,7 @@ struct YHScoreResultModel: SmartCodable { ...@@ -18,7 +18,7 @@ struct YHScoreResultModel: SmartCodable {
var talent_list_score : YHScoreResultBaseModel? var talent_list_score : YHScoreResultBaseModel?
var total_score : YHScoreSumscore? var total_score : YHScoreSumscore?
var user_info : YHScoreUserInfo? var userinfo : YHScoreUserInfo?
} }
struct YHScoreUserInfo : SmartCodable { struct YHScoreUserInfo : SmartCodable {
......
...@@ -56,11 +56,8 @@ extension YHScoreItemCell { ...@@ -56,11 +56,8 @@ extension YHScoreItemCell {
guard let arrData = optionData?.options else { guard let arrData = optionData?.options else {
return return
} }
holdView.removeSubviews()
for view in holdView.subviews { contentView.removeSubviews()
view.removeFromSuperview()
}
holdView.removeFromSuperview()
contentView.addSubview(holdView) contentView.addSubview(holdView)
...@@ -93,8 +90,6 @@ extension YHScoreItemCell { ...@@ -93,8 +90,6 @@ extension YHScoreItemCell {
var tagView : UIView = resultView var tagView : UIView = resultView
for (index,item) in arrData.enumerated() { for (index,item) in arrData.enumerated() {
let optionView = YHScoreOptionsView() let optionView = YHScoreOptionsView()
optionView.dataModel = item optionView.dataModel = item
holdView.addSubview(optionView) holdView.addSubview(optionView)
......
...@@ -12,6 +12,12 @@ import AttributedString ...@@ -12,6 +12,12 @@ import AttributedString
class YHScorePersonInfoCell: UITableViewCell { class YHScorePersonInfoCell: UITableViewCell {
static let cellReuseIdentifier = "YHScorePersonInfoCell" static let cellReuseIdentifier = "YHScorePersonInfoCell"
lazy var requestVM : YHBaseViewModel = {
let r = YHBaseViewModel()
return r
}()
var dataModel : YHScoreResultModel? { var dataModel : YHScoreResultModel? {
didSet { didSet {
updateUI() updateUI()
...@@ -29,7 +35,7 @@ class YHScorePersonInfoCell: UITableViewCell { ...@@ -29,7 +35,7 @@ class YHScorePersonInfoCell: UITableViewCell {
//姓名 //姓名
private lazy var nameLable : UILabel = { private lazy var nameLable : UILabel = {
let lable0 = UILabel(text: "DavidHuang") let lable0 = UILabel(text: "")
lable0.textColor = UIColor.mainTextColor lable0.textColor = UIColor.mainTextColor
lable0.font = UIFont.PFSC_M(ofSize: 16) lable0.font = UIFont.PFSC_M(ofSize: 16)
return lable0 return lable0
...@@ -37,7 +43,7 @@ class YHScorePersonInfoCell: UITableViewCell { ...@@ -37,7 +43,7 @@ class YHScorePersonInfoCell: UITableViewCell {
//电话号码 //电话号码
private lazy var phoneLable : UILabel = { private lazy var phoneLable : UILabel = {
let lable0 = UILabel(text: "15818743775") let lable0 = UILabel(text: "")
lable0.textColor = UIColor.labelTextColor2 lable0.textColor = UIColor.labelTextColor2
lable0.font = UIFont.PFSC_R(ofSize: 12) lable0.font = UIFont.PFSC_R(ofSize: 12)
return lable0 return lable0
...@@ -192,8 +198,9 @@ extension YHScorePersonInfoCell { ...@@ -192,8 +198,9 @@ extension YHScorePersonInfoCell {
return return
} }
nameLable.text = model.user_info?.username ?? "-" handleCardImage()
phoneLable.text = model.user_info?.mobile ?? "-" nameLable.text = model.userinfo?.username ?? "-"
phoneLable.text = model.userinfo?.mobile ?? "-"
let score : String = String(model.total_score?.sum_score ?? 0) let score : String = String(model.total_score?.sum_score ?? 0)
let a: ASAttributedString = .init(NSAttributedString(string: score), .font(UIFont.PFSC_R(ofSize: 43)),.foreground(UIColor(hex:0xFFEEB0))) let a: ASAttributedString = .init(NSAttributedString(string: score), .font(UIFont.PFSC_R(ofSize: 43)),.foreground(UIColor(hex:0xFFEEB0)))
...@@ -201,4 +208,19 @@ extension YHScorePersonInfoCell { ...@@ -201,4 +208,19 @@ extension YHScorePersonInfoCell {
scoreLable.attributed.text = a + b scoreLable.attributed.text = a + b
} }
private func handleCardImage() {
guard let dataModel = dataModel?.userinfo, dataModel.head_url.isEmpty == false else { return }
let url = dataModel.head_url
if url.isEmpty == false {
self.requestVM.getPublicImageUrl(url) {[weak self] success, error in
guard let self = self else { return }
guard success != nil else { return }
self.headImagV.kf.setImage(with: URL(string: success))
}
}
}
} }
...@@ -116,8 +116,13 @@ private extension YHScoreResultView { ...@@ -116,8 +116,13 @@ private extension YHScoreResultView {
guard let model = dataModel else { return } guard let model = dataModel else { return }
if model.answer.isEmpty { if model.answer.isEmpty {
iconImageV.image = UIImage(named: "score_satisfy_1") if model.result.contains("年龄") {
nameLable.text = "不满足" iconImageV.image = UIImage(named: "score_satisfy_0")
nameLable.text = model.result
} else {
iconImageV.image = UIImage(named: "score_satisfy_1")
nameLable.text = "不满足"
}
} else { } else {
iconImageV.image = UIImage(named: "score_satisfy_0") iconImageV.image = UIImage(named: "score_satisfy_0")
nameLable.text = model.result nameLable.text = model.result
......
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