Commit 13df4a5fa60859318d5cdd6f6408bdc9a2b598e9
1 parent
1fb5b8c7
预览简历页--手机号和工作年限显示问题
Showing
1 changed file
with
56 additions
and
3 deletions
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreViewFirCell.swift
| ... | ... | @@ -253,7 +253,13 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell { |
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | self.phoneTitleLabel.text = phoneTitleLabelStr |
| 256 | - | |
| 256 | + self.phoneTitleLabel.sizeToFit() | |
| 257 | + self.phoneTitleLabel.snp.remakeConstraints { make in | |
| 258 | + make.left.equalTo(15) | |
| 259 | + make.top.equalTo(self.authNameTitleLabel.snp.bottom).offset(adapt_length(length: 8)) | |
| 260 | + make.width.equalTo(self.phoneTitleLabel.size.width) | |
| 261 | + make.height.equalTo(self.phoneTitleLabel.size.height) | |
| 262 | + } | |
| 257 | 263 | |
| 258 | 264 | if model.vitae?.profession.count ?? 0 > 0{ |
| 259 | 265 | self.hangyeTitleLabel.text = model.vitae?.profession |
| ... | ... | @@ -263,14 +269,61 @@ class CNLiveDigitalResumePreViewFirCell: UITableViewCell { |
| 263 | 269 | }else{ |
| 264 | 270 | self.weizhiTitleLabel.text = " | 位置未授权" |
| 265 | 271 | } |
| 272 | +// if model.vitae?.workTime.count ?? 0 > 0{ | |
| 273 | +// self.workTitleLabel.text = model.vitae!.workTime | |
| 274 | +// }else{ | |
| 275 | +// self.workTitleLabel.text = "参加工作时间未设置 >" | |
| 276 | +// } | |
| 277 | + | |
| 266 | 278 | if model.vitae?.workTime.count ?? 0 > 0{ |
| 267 | - self.workTitleLabel.text = model.vitae!.workTime | |
| 279 | + var yearStr = "" | |
| 280 | + var workTimeStr = "" | |
| 281 | + let arr = model.vitae!.workTime.components(separatedBy: "(") | |
| 282 | + if arr.count > 0{ | |
| 283 | + workTimeStr = arr.first! as String | |
| 284 | + }else{ | |
| 285 | + workTimeStr = model.vitae!.workTime | |
| 286 | + } | |
| 287 | + | |
| 288 | + if let workExperience = self.calculateWorkExperience(fromDateString: workTimeStr){ | |
| 289 | + yearStr = "\(workExperience)年经验" | |
| 290 | + }else{ | |
| 291 | + yearStr = "" | |
| 292 | + } | |
| 293 | + | |
| 294 | + self.workTitleLabel.text = yearStr//model.vitae!.workTime | |
| 295 | + | |
| 268 | 296 | }else{ |
| 269 | 297 | self.workTitleLabel.text = "参加工作时间未设置 >" |
| 270 | 298 | } |
| 271 | 299 | |
| 272 | 300 | } |
| 273 | - | |
| 301 | + //计算工作年限 | |
| 302 | + func calculateWorkExperience(fromDateString: String) -> Int? { | |
| 303 | + let formatter = DateFormatter() | |
| 304 | + formatter.dateFormat = "yyyy-MM-dd" | |
| 305 | + formatter.timeZone = TimeZone(abbreviation: "UTC")! // 确保时区一致,或者根据需要调整 | |
| 306 | + | |
| 307 | + guard let startDate = formatter.date(from: fromDateString) else { | |
| 308 | + return nil | |
| 309 | + } | |
| 310 | + | |
| 311 | + let calendar = Calendar.current | |
| 312 | + let currentDate = Date() | |
| 313 | + | |
| 314 | + // 计算年份差,这里我们不需要精确的月份和日期,所以只需要年份组件 | |
| 315 | + let components = calendar.dateComponents([.year], from: startDate, to: currentDate) | |
| 316 | + guard let yearDifference = components.year else { | |
| 317 | + return nil | |
| 318 | + } | |
| 319 | + | |
| 320 | + // 如果需要,可以对年份差进行四舍五入(但在这个场景下,由于我们只计算整年,所以四舍五入可能不是必需的) | |
| 321 | + // 但为了完整性,我还是展示了如何四舍五入到最近的整数 | |
| 322 | + let roundedYearDifference = round(Double(yearDifference)) | |
| 323 | + | |
| 324 | + // 返回工作经验年数(已经是整数了,因为round函数的结果会被隐式转换为Int) | |
| 325 | + return Int(roundedYearDifference) | |
| 326 | + } | |
| 274 | 327 | func convertTimestampStringToDateString(timestampString: String) -> String? { |
| 275 | 328 | // 首先,将毫秒时间戳字符串转换为TimeInterval(秒) |
| 276 | 329 | guard let timestampMilliseconds = Double(timestampString) else { | ... | ... |