Михаил Капелько 1年前
父节点
当前提交
9e941f01a5
共有 2 个文件被更改,包括 16 次插入1 次删除
  1. +5
    -1
      Modules/MicX/MicItem/src/MicItem.Shoulds.swift
  2. +11
    -0
      Modules/MicX/MicItem/src/MicItem.WillBe.swift

+ 5
- 1
Modules/MicX/MicItem/src/MicItem.Shoulds.swift 查看文件

@@ -8,6 +8,10 @@ public extension MicItem {
return now < end return now < end
} }


if timeout {
return false
}

return nil return nil
} }


@@ -18,7 +22,7 @@ public extension MicItem {
{ {
let timeout = end.timeIntervalSinceNow let timeout = end.timeIntervalSinceNow
/**/print("ИГР MicIS.shouldRT timeout: '\(timeout)'") /**/print("ИГР MicIS.shouldRT timeout: '\(timeout)'")
return nil return timeout > 0 ? timeout : nil
} }


return nil return nil


+ 11
- 0
Modules/MicX/MicItem/src/MicItem.WillBe.swift 查看文件

@@ -3,11 +3,13 @@ import MPAKX


public protocol MicItemContext { public protocol MicItemContext {
var activityDate: MPAK.Recent<Date?> { get } var activityDate: MPAK.Recent<Date?> { get }
var timeout: Bool { get }
} }


extension MicItem { extension MicItem {
public struct Model: MicItemContext { public struct Model: MicItemContext {
public var activityDate: MPAK.Recent<Date?> = .init(nil) public var activityDate: MPAK.Recent<Date?> = .init(nil)
public var timeout: Bool = false
} }
} }


@@ -37,6 +39,15 @@ extension MicItem {
}, },
{ m, _ in m.activityDate.isRecent = false } { m, _ in m.activityDate.isRecent = false }
) )

ctrl.pipe(
dbg: "timeout",
sub: nil,
Bus.events.compactMap { Bus.convertKeyValue(K.timeout, $0) }.map { (k: String, v: Bool) in v }.eraseToAnyPublisher(),
{ $0.timeout = true },
{ $0.timeout = false }
)

} }
} }
} }

正在加载...
取消
保存