1、IM消息 @某人 高亮

2、删除不使用的代码

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewWorkExpViewController.swift

@@ -64,14 +64,12 @@ private extension YHPreviewWorkExpViewController {
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
 extension YHPreviewWorkExpViewController {
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-//        return previewVM.arrDataForWorkExpInfo.count
         return previewVM.arrDataForWorkExpInfoNew.count
     }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
         cell.selectionStyle = .none
-//        cell.model = previewVM.arrDataForWorkExpInfo[indexPath.row]
         if !previewVM.arrDataForWorkExpInfoNew.isEmpty,indexPath.row  < previewVM.arrDataForWorkExpInfoNew.count  {
             cell.model = previewVM.arrDataForWorkExpInfoNew[indexPath.row]
         }

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

@@ -434,7 +434,7 @@ private extension YHPreviewViewModel {
                     arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16])
                 }
                 
-                let dataModel1 = YHWorkExpDataModel(title: "davidhuangTest1", data: arr1)
+                let dataModel1 = YHWorkExpDataModel(title: "", data: arr1)
                 
                 var arr2 : [YHPreviewQuestionAndAnswerModel] = []
                 do {
@@ -445,7 +445,7 @@ private extension YHPreviewViewModel {
                     
                     arr2.append(contentsOf: [tmp1,tmp2,tmp3])
                 }
-                let dataModel2 = YHWorkExpDataModel(title: "davidhuangTest2", data: arr2)
+                let dataModel2 = YHWorkExpDataModel(title: "", data: arr2)
                 
                 var arr3 : [Any] = []
                 do {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHGCPreviewWorkExpViewController.swift

@@ -64,14 +64,12 @@ private extension YHGCPreviewWorkExpViewController {
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
 extension YHGCPreviewWorkExpViewController {
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-//        return previewVM.arrDataForWorkExpInfo.count
         return previewVM.arrDataForWorkExpInfoNew.count
     }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
         cell.selectionStyle = .none
-//        cell.model = previewVM.arrDataForWorkExpInfo[indexPath.row]
         if !previewVM.arrDataForWorkExpInfoNew.isEmpty,indexPath.row  < previewVM.arrDataForWorkExpInfoNew.count  {
             cell.model = previewVM.arrDataForWorkExpInfoNew[indexPath.row]
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHGCPreviewViewModel.swift

@@ -428,7 +428,7 @@ private extension YHGCPreviewViewModel {
                     arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16])
                 }
                 
-                let dataModel1 = YHWorkExpDataModel(title: "davidhuangTest1", data: arr1)
+                let dataModel1 = YHWorkExpDataModel(title: "", data: arr1)
                 
                 var arr2 : [YHPreviewQuestionAndAnswerModel] = []
                 do {
@@ -439,7 +439,7 @@ private extension YHGCPreviewViewModel {
                     
                     arr2.append(contentsOf: [tmp1,tmp2,tmp3])
                 }
-                let dataModel2 = YHWorkExpDataModel(title: "davidhuangTest2", data: arr2)
+                let dataModel2 = YHWorkExpDataModel(title: "", data: arr2)
                 
                 var arr3 : [Any] = []
                 do {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHLiveMessageCell.swift

@@ -62,10 +62,29 @@ class YHLiveMessageCell: UITableViewCell {
         }
     }
 
-    func configureNormalMessage(_ nickname: String, _ content: String, isAnchor: Bool) {
-        let nickAtt = isAnchor ? ASAttributedString(string: nickname + "：", .foreground(UIColor(hexString: "#FFE3BB") ?? UIColor.white), .font(UIFont.PFSC_R(ofSize: 13))) : ASAttributedString(string: nickname + "：", .foreground(UIColor.white.withAlphaComponent(0.65)), .font(UIFont.PFSC_R(ofSize: 13)))
-        let contentAtt = ASAttributedString(string: content, .foreground(UIColor.white), .font(UIFont.PFSC_R(ofSize: 13)))
-        contentLabel.attributed.text = nickAtt + contentAtt
+    func configureNormalMessage(_ nickname: String, _ content: String,highlightTxt : String = "", isAnchor: Bool = false) {
+        if highlightTxt.isEmpty {
+            let nickAtt = isAnchor ? ASAttributedString(string: nickname + "：", .foreground(UIColor(hexString: "#FFE3BB") ?? UIColor.white), .font(UIFont.PFSC_R(ofSize: 13))) : ASAttributedString(string: nickname + "：", .foreground(UIColor.white.withAlphaComponent(0.65)), .font(UIFont.PFSC_R(ofSize: 13)))
+            let contentAtt = ASAttributedString(string: content, .foreground(UIColor.white), .font(UIFont.PFSC_R(ofSize: 13)))
+            contentLabel.attributed.text = nickAtt + contentAtt
+        } else {
+            
+            let nickAtt = isAnchor ? ASAttributedString(string: nickname + "：", .foreground(UIColor(hexString: "#FFE3BB") ?? UIColor.white), .font(UIFont.PFSC_R(ofSize: 13))) : ASAttributedString(string: nickname + "：", .foreground(UIColor.white.withAlphaComponent(0.65)), .font(UIFont.PFSC_R(ofSize: 13)))
+            
+            var contentAtt = ASAttributedString(string: content, .foreground(UIColor.white), .font(UIFont.PFSC_R(ofSize: 13)))
+            if content.starts(with: highlightTxt, caseSensitive: false) {
+                contentAtt = ""
+                var content2 = content
+                let part1 = ASAttributedString(string: highlightTxt, .foreground(UIColor.white.withAlphaComponent(0.65)),.font(UIFont.PFSC_R(ofSize: 13)))
+                
+                let part2Str = content2.slice(at: highlightTxt.count)
+                
+                let part2 = ASAttributedString(string: part2Str, .foreground(UIColor.white),.font(UIFont.PFSC_R(ofSize: 13)))
+                contentLabel.attributed.text = nickAtt + part1 + part2
+            } else {
+                contentLabel.attributed.text = nickAtt + contentAtt
+            }
+        }
     }
     
     func configureTipsMessage(_ tips: String) {

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/V/YHLiveMessageListView.swift

@@ -110,15 +110,17 @@ extension YHLiveMessageListView: UITableViewDelegate, UITableViewDataSource {
         cell.contentView.transform = CGAffineTransform(rotationAngle: .pi)
         var nickName: String = ""
         var content: String = ""
+        var highlight : String = ""
         if let ext = message.ext {
             nickName = ext["fromNickName"] as? String ?? "YinHe"
+            highlight = ext["replyTo"] as? String ?? ""
         }
         if let body = message.body as? EMTextMessageBody, body.type == .text {
             printLog(body.text)
             printLog("\(nickName) : \(body.text)")
             content = body.text
             let isAnchor = nickName == anchorName
-            cell.configureNormalMessage(nickName, content, isAnchor: isAnchor)
+            cell.configureNormalMessage(nickName, content,highlightTxt: highlight, isAnchor: isAnchor)
         } else if let body = message.body as? EMCustomMessageBody, body.event == YHChatRoomCustomLocal.tipsEvent, let customExt = body.customExt, let tips = customExt[YHChatRoomCustomLocal.tipsKey] {
             cell.configureTipsMessage(tips)
         }