Commit 2933e834 authored by David黄金龙's avatar David黄金龙

修改 一处bug

parent 4e447b2e
...@@ -10,7 +10,6 @@ import UIKit ...@@ -10,7 +10,6 @@ import UIKit
import AttributedString import AttributedString
class YHOrderTipsItemView: UIView { class YHOrderTipsItemView: UIView {
static let viewH = 52.0 static let viewH = 52.0
var message : YHHomeLastMessageModel? { var message : YHHomeLastMessageModel? {
...@@ -19,6 +18,8 @@ class YHOrderTipsItemView: UIView { ...@@ -19,6 +18,8 @@ class YHOrderTipsItemView: UIView {
} }
} }
var indexItem : Int = 0
func getTypeString() -> String { func getTypeString() -> String {
if let msg = self.message { if let msg = self.message {
if msg.type == YHMessageType.infoFill.rawValue { if msg.type == YHMessageType.infoFill.rawValue {
...@@ -35,10 +36,12 @@ class YHOrderTipsItemView: UIView { ...@@ -35,10 +36,12 @@ class YHOrderTipsItemView: UIView {
} else if msg.type == YHMessageType.infoSubmit.rawValue { } else if msg.type == YHMessageType.infoSubmit.rawValue {
return "资料递交" return "资料递交"
} else {
return "--"
} }
} }
return "" return "-"
} }
func updateData() { func updateData() {
...@@ -46,21 +49,29 @@ class YHOrderTipsItemView: UIView { ...@@ -46,21 +49,29 @@ class YHOrderTipsItemView: UIView {
let typeString = self.getTypeString() let typeString = self.getTypeString()
lableMyOrder.text = typeString lableMyOrder.text = typeString
lableName.text = message.content lableName.text = message.content
lableTime.text = getTimeString(data: TimeInterval(message.time)) if indexItem == 1 {
lableTime.text = "最新消息"
} else {
lableTime.text = getTimeString(data: TimeInterval(message.time))
}
} }
func getTimeString(data: TimeInterval) -> String { func getTimeString(data: TimeInterval) -> String {
let timestamp = Date().timeIntervalSince1970 let timestamp = Date().timeIntervalSince1970
let distance = timestamp - data let distance = timestamp - data
if distance < 60 { if distance < 60 {
return "最新消息" return "最新消息" //1分钟内
} else if distance < 60 * 60 { } else if distance < 60 * 60 {
let time = (distance/60).int let time = (distance/60).int
return "\(time)分钟前" return "\(time)分钟前" //60分钟
} else if distance < 24 * 60 * 60 { } else if distance < 24 * 60 * 60 {
let time = (distance/60/60).int let time = (distance/60/60).int
return "\(time)小时前" return "\(time)小时前" //
} else if distance < 48 * 60 * 60 { } else if distance < 48 * 60 * 60 {
return "昨天" return "昨天"
} else { } else {
// 将TimeInterval转换为Date // 将TimeInterval转换为Date
......
...@@ -166,12 +166,14 @@ class YHOrderTipsView: UIView { ...@@ -166,12 +166,14 @@ class YHOrderTipsView: UIView {
lazy var firstItem: YHOrderTipsItemView = { lazy var firstItem: YHOrderTipsItemView = {
let itemView : YHOrderTipsItemView = YHOrderTipsItemView() let itemView : YHOrderTipsItemView = YHOrderTipsItemView()
itemView.indexItem = 1
itemView.isHidden = true itemView.isHidden = true
return itemView return itemView
}() }()
lazy var secondItem: YHOrderTipsItemView = { lazy var secondItem: YHOrderTipsItemView = {
let itemView : YHOrderTipsItemView = YHOrderTipsItemView() let itemView : YHOrderTipsItemView = YHOrderTipsItemView()
itemView.indexItem = 2
itemView.isHidden = true itemView.isHidden = true
return itemView return itemView
}() }()
......
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