处理 特长的 字符

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemView.swift

@@ -22,8 +22,6 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 14)
-//        lable0.numberOfLines = 1
-//        lable0.lineBreakMode = .byCharWrapping
         return lable0
     }()
     
@@ -65,6 +63,17 @@ extension YHPreviewInfoNameAndSubNameItemView {
     func update(title : String,subtitle : String) {
         nameLable.text = title
         subtitleLable.text = subtitle
+        
+        //处理特长的字符
+        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")  {
+            nameLable.snp.remakeConstraints { make in
+                make.top.equalToSuperview().offset(18)
+                make.left.equalToSuperview()
+                make.width.lessThanOrEqualTo(200)
+                make.height.equalTo(20)
+            }
+            nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -226,7 +226,7 @@ private extension YHPreviewViewModel {
                     let tmp1 = YHPreviewQuestionAndAnswerModel(question: "用人单位：", answer: model.company_name)
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "用人单位性质：", answer: model.industry)
                     let tmp3 = YHPreviewQuestionAndAnswerModel(question: "用人单位介绍：", answer: model.company_introduce)
-                    let tmp4 = YHPreviewQuestionAndAnswerModel(question: "用人单位官网：", answer: model.company_website)
+                    let tmp4 = YHPreviewQuestionAndAnswerModel(question: "用人单位官网：", answer: model.company_website.defaultStringIfEmpty())
                     var title = "-"
                     if let item = model.location {
                         title = item.country + "-"  + item.details
@@ -244,7 +244,7 @@ private extension YHPreviewViewModel {
                     let tempppp = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .structure)
                     let tmp13 = YHPreviewQuestionAndAnswerModel(question: "行政架构层级：", answer:tempppp)
                     let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total))
-                    let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover))
+                    let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover).defaultStringIfEmpty())
                     
                     let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .level)
                     let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:tempppp0)
@@ -256,7 +256,7 @@ private extension YHPreviewViewModel {
                 var arr2 : [YHPreviewQuestionAndAnswerModel] = []
                 do {
                     //2.
-                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "公司业务性质/范畴/所属行业：", answer:model.business_nature)
+                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "公司业务性质/范畴/所属行业：", answer:model.business_nature.defaultStringIfEmpty())
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "工作职责：", answer:model.wduty)
                     let tmp3 = YHPreviewQuestionAndAnswerModel(question: "工作亮点：", answer:model.highlights)
                     
@@ -409,8 +409,8 @@ private extension YHPreviewViewModel {
         do {
             //基本信息
             let tmp0 = YHPreviewQuestionAndAnswerModel(question: "主申请人：", answer: model.username)
-            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.used_name.isEmpty ? "--" : model.used_name)
-            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname)
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.used_name.defaultStringIfEmpty())
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.defaultStringIfEmpty())
             let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
             let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: model.birth_place)
             
@@ -430,7 +430,7 @@ private extension YHPreviewViewModel {
                 let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: model.is_live_oversea_year == 1 ? "是" : "否")
                 arr.append(tmp10)
             } else {
-                let tmp10 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: model.live_address_detail)
+                let tmp10 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: model.live_address_detail.defaultStringIfEmpty())
                 arr.append(tmp10)
             }
             
@@ -946,7 +946,7 @@ private extension YHPreviewViewModel {
                 do {
                     //配偶信息-否
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
-                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
+                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
                     let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
                     var city = ""
@@ -994,7 +994,7 @@ private extension YHPreviewViewModel {
                 do {
                     //配偶信息
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
-                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
+                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
                     let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
                     var city = ""
@@ -1061,7 +1061,7 @@ private extension YHPreviewViewModel {
                         let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: title)
                         arr.append(tmp12)
                     }
-                    let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address)
+                    let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
                     arr.append(tmp133)
                     
                     let tmp13 = YHPreviewQuestionAndAnswerModel(question: "目前是否在港：", answer: model.hkIdentity.isEmpty == false ? "是" : "否")
@@ -1248,8 +1248,8 @@ private extension YHPreviewViewModel {
                 do {
                     //配偶信息-否
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
-                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.isEmpty ? "--" : model.usedName)
-                    let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname)
+                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
+                    let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.defaultStringIfEmpty())
                     let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
                     let tmp22 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: sexStr)
                     let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
@@ -1305,7 +1305,7 @@ private extension YHPreviewViewModel {
                 do {
                     //子女信息
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "子女姓名：", answer: model.subsetName)
-                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
+                    let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
                     
                     let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
@@ -1383,7 +1383,7 @@ private extension YHPreviewViewModel {
                     }
                     
                     if model.nows == 0 {
-                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address)
+                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
                         arr.append(tmp133)
                     }
                     

galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift

@@ -42,7 +42,7 @@ extension String {
     }
     
     //判断字符串并返回默认值
-    func defaultStringIfEmpty(detaultValue : String = "-") -> String {
+    func defaultStringIfEmpty(detaultValue : String = "--") -> String {
         if self.isEmpty {
             return detaultValue
         }