diff --git a/Assets/Cryville.EEW.Unity/UI/EventReportView.cs b/Assets/Cryville.EEW.Unity/UI/EventReportView.cs index dd2e087..ac91e81 100644 --- a/Assets/Cryville.EEW.Unity/UI/EventReportView.cs +++ b/Assets/Cryville.EEW.Unity/UI/EventReportView.cs @@ -22,6 +22,7 @@ namespace Cryville.EEW.Unity.UI { } public virtual void SetViewModel(ReportViewModel viewModel, bool hideRevision = false) { _viewModel = viewModel; + if (hideRevision) hideRevision = ShouldHideRevision(viewModel.RevisionKey); if (m_titleView != null) { var title = viewModel.Title ?? ""; @@ -56,7 +57,7 @@ namespace Cryville.EEW.Unity.UI { ); } - protected static bool ShouldHideRevision(IReportRevisionKey key) { + static bool ShouldHideRevision(IReportRevisionKey key) { return key == null || (key.Serial == null && !key.IsCancellation && !key.IsFinalRevision); } } diff --git a/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs b/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs index 1916a83..4ad9163 100644 --- a/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs +++ b/Assets/Cryville.EEW.Unity/UI/EventUnitView.cs @@ -18,7 +18,7 @@ namespace Cryville.EEW.Unity.UI { public void Set(ReportUnit unit) { lock (unit) { - SetViewModel(unit.LatestReport, ShouldHideRevision(unit.LatestReport.RevisionKey) && unit.Count <= 1); + SetViewModel(unit.LatestReport, unit.Count <= 1); m_listView.Set(unit); } m_listView.gameObject.SetActive(false);