diff --git a/SmartAquaViewer/Classes/Converter.cs b/SmartAquaViewer/Classes/Converter.cs index 4e62067..9023b12 100644 --- a/SmartAquaViewer/Classes/Converter.cs +++ b/SmartAquaViewer/Classes/Converter.cs @@ -49,4 +49,33 @@ namespace SmartAquaViewer.Classes int.TryParse(value?.ToString(), out var v) ? Math.Max(1, v) - 1 : 0; } + public class PageIndexToDisplayConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is int idx) + return (idx + 1).ToString(); // 0 -> 1, 1 -> 2 ... + return value; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + if (int.TryParse(value?.ToString(), out int display)) + return display - 1; // 1 -> 0 + return 0; + } + } + + public class CurrentPageEqualsConverter : IMultiValueConverter + { + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) + { + if (values.Length >= 2 && values[0] is int buttonIndex && values[1] is int currentIndex) + return buttonIndex == currentIndex; + return false; + } + + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) + => throw new NotImplementedException(); + } } diff --git a/SmartAquaViewer/Model/Datas.cs b/SmartAquaViewer/Model/Datas.cs index d27c81e..82d5e7e 100644 --- a/SmartAquaViewer/Model/Datas.cs +++ b/SmartAquaViewer/Model/Datas.cs @@ -50,8 +50,10 @@ namespace SmartAquaViewer.Model { string cctvListPath = Utils.Instance.GetDataFileContentPath(Constants.DataFiles.CCTV_LIST); if (!File.Exists(cctvListPath)) + { CreateAndSetMockUpCCTVInfoList(cctvListPath); return; + } string jsonString = File.ReadAllText(cctvListPath); var cctvInfoList = JsonConvert.DeserializeObject>(jsonString) ?? new List(); diff --git a/SmartAquaViewer/View/EnegyView.xaml b/SmartAquaViewer/View/EnegyView.xaml index 2a1de07..fd5c9cc 100644 --- a/SmartAquaViewer/View/EnegyView.xaml +++ b/SmartAquaViewer/View/EnegyView.xaml @@ -14,6 +14,8 @@ + + @@ -178,13 +180,51 @@ - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + +