diff --git a/Veloria/Base/View/TabBar/VPTabBar.swift b/Veloria/Base/View/TabBar/VPTabBar.swift index 5404c43..19a4b33 100644 --- a/Veloria/Base/View/TabBar/VPTabBar.swift +++ b/Veloria/Base/View/TabBar/VPTabBar.swift @@ -32,9 +32,14 @@ class VPTabBar: UITabBar { var containers = [VPTabBarItemContainer]() +// private lazy var oldFrame: CGRect = .zero + override func layoutSubviews() { super.layoutSubviews() -// self.updateLayout() +// if oldFrame != self.frame { +// oldFrame = self.frame +// self.updateLayout() +// } } override func setItems(_ items: [UITabBarItem]?, animated: Bool) { diff --git a/Veloria/Libs/MarqueeView/VPMarqueeView.swift b/Veloria/Libs/MarqueeView/VPMarqueeView.swift index 64f959e..26b2c71 100644 --- a/Veloria/Libs/MarqueeView/VPMarqueeView.swift +++ b/Veloria/Libs/MarqueeView/VPMarqueeView.swift @@ -48,6 +48,7 @@ class VPMarqueeView: UIView { override init(frame: CGRect) { super.init(frame: frame) self.isUserInteractionEnabled = false + self.clipsToBounds = true addSubview(scrollView) scrollView.addSubview(oneLabel) scrollView.addSubview(twoLabel) @@ -79,11 +80,14 @@ class VPMarqueeView: UIView { func start() { if self.timer == nil { - self.timer = Timer.scheduledTimer(timeInterval: 4, target: YYWeakProxy(target: self), selector: #selector(handleTimer), userInfo: nil, repeats: true) + self.timer = Timer.scheduledTimer(timeInterval: 5, target: YYWeakProxy(target: self), selector: #selector(handleTimer), userInfo: nil, repeats: true) } } - + func pause() { + self.timer?.invalidate() + self.timer = nil + } }