消息bug修复

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -116,7 +116,7 @@ class YHHomePageViewController: YHBaseViewController {
                         self.viewModel.getLastTwoMessagesForSigner { success, error in
                             if success {
                                 self.homeHeaderView.orderTipsView.arrLastTwoMessage = self.viewModel.arrLastTwoMessages
-                                
+                                self.homeHeaderView.updateSubViewsConstraints()
                             } else {
                                 
                             }

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeHeadView.swift

@@ -100,13 +100,49 @@ class YHHomeHeadView: UIView {
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        
-        
-        
-
-        
-        
-        
+    }
+    
+    func updateSubViewsConstraints() {
+        homeBannerView.snp.remakeConstraints { make in
+            make.top.equalTo(0)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHHomeBannerView.viewH)
+        }
+        homeHkLife.snp.remakeConstraints { make in
+            make.top.equalTo(homeBannerView.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHHkLifeAndIdView.viewH)
+        }
+        homeKingKongBlock.snp.remakeConstraints { make in
+            make.top.equalTo(homeHkLife.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHHomeKingKongBlockView.viewH)
+        }
+        bannerLineTop.snp.remakeConstraints { make in
+            make.top.equalTo(homeKingKongBlock.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(1)
+        }
+        orderTipsView.snp.remakeConstraints { make in
+            make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(orderTipsView.tipViewH)
+        }
+        aiRadarArea.snp.remakeConstraints { make in
+            make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHAiRadarAreaView.viewH)
+        }
+        salonArea.snp.remakeConstraints { make in
+            make.top.equalTo(aiRadarArea.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHHomeSalonAreaView.viewH)
+        }
+        bannerLineBottom.snp.remakeConstraints { make in
+            make.top.equalTo(salonArea.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(1)
+        }
     }
 }
 
@@ -146,7 +182,8 @@ private extension YHHomeHeadView {
         orderTipsView.snp.makeConstraints { make in
             make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
             make.left.right.equalToSuperview()
-            make.height.equalTo(orderTipsView.tipViewH)
+            make.height.equalTo(226)
+//            make.height.equalTo(orderTipsView.tipViewH)
         }
         
         

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift

@@ -13,6 +13,57 @@ class YHOrderTipsItemView: UIView {
 
     static let viewH = 52.0
     
+    var message : YHHomeLastMessageModel? {
+        didSet {
+            updateData()
+        }
+    }
+    
+    func updateData() {
+        guard let message = message else { return }
+        var typeString = ""
+        if message.type == 1 {
+            typeString = "资料填写"
+        } else if message.type == 2 {
+            typeString = "证件上传"
+        } else if message.type == 3 {
+            typeString = "文书定稿"
+        } else if message.type == 4 {
+            typeString = "文件签字"
+        } else if message.type == 5 {
+            typeString = "资料递交"
+        }
+        lableMyOrder.text = typeString
+        lableName.text = message.content
+        lableTime.text = getTimeString(data: TimeInterval(message.time))
+    }
+    
+    func getTimeString(data: TimeInterval) -> String {
+        let timestamp = Date().timeIntervalSince1970
+        let distance = timestamp - data
+        if distance < 60 {
+            return "最新消息"
+        } else if distance < 60 * 60 {
+            let time = (distance/60).int
+            return "\(time)分钟前"
+        } else if distance < 24 * 60 * 60 {
+            let time = (distance/24/60).int
+            return "\(time)小时前"
+        } else if distance < 48 * 60 * 60 {
+            return "昨天"
+        } else {
+            // 将TimeInterval转换为Date
+            let date = Date(timeIntervalSince1970: data)
+            // 创建一个DateFormatter来格式化日期
+            let formatter = DateFormatter()
+            formatter.dateFormat = "MM-dd" // 设置日期格式
+            formatter.locale = Locale(identifier: "en_US_POSIX") // 设置地区，避免时区问题
+            // 将Date转换为字符串
+            let dateString = formatter.string(from: date)
+            return dateString
+        }
+    }
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupUI()

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift

@@ -230,6 +230,11 @@ private extension YHOrderTipsView {
             firstItem.isHidden = true
             secondItem.isHidden = true
         }
+        if let first = arrLastTwoMessage?.first, let last = arrLastTwoMessage?.last {
+            firstItem.message = first
+            secondItem.message = last
+        }
+        setNeedsLayout()
         layoutIfNeeded()
     }
     

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -76,22 +76,7 @@ extension YHHomePageViewModel {
             }
             arrLastTwoMessages = result.list
             
-//            let model1 = YHHomeLastMessageModel()
-//            model1.id = "1"
-//            model1.content = "我是内容呀 消息填写"
-//            model1.time = 1609459200
-//            model1.type = 1
-//            
-//            
-//            let model2 = YHHomeLastMessageModel()
-//            model2.id = "2"
-//            model2.content = "我是内容呀 消息填写"
-//            model2.time = 1609459200
-//            model2.type = 2
-//            
-//            arrLastTwoMessages = [model1,model2] //for test hjl 测试数据
-            
-            
+            //for test hjl 测试数据
             
             callBackBlock(true,nil)
         } failBlock: { err in