[fix] 修复历史天气无法显示破纪录温度的问题

zxbmmmmmmmmm · Jul 22, 2024 · 281372b · 281372b
1 parent b5857f4
commit 281372b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/FluentWeather.Uwp.Shared/Helpers/ValueConverters/ConverterMethods.cs b/FluentWeather.Uwp.Shared/Helpers/ValueConverters/ConverterMethods.cs
@@ -149,5 +149,14 @@ public static int Subtract(this int num1,int num2)
     {
         return num1 - num2;
     }
+
+    public static int Max(this int num1, int num2)
+    {
+        return Math.Max(num1, num2);
+    }
+    public static int Min(this int num1, int num2)
+    {
+        return Math.Min(num1, num2);
+    }
 }
 
diff --git a/FluentWeather.Uwp/Controls/HistoricalWeatherGauge.xaml b/FluentWeather.Uwp/Controls/HistoricalWeatherGauge.xaml
@@ -18,8 +18,8 @@
             Margin="24,0"
             x:DefaultBindMode="OneWay"
             LabelStep="1"
-            MaxValue="{x:Bind HistoricalDailyWeather.HistoricalMaxTemperature}"
-            MinValue="{x:Bind HistoricalDailyWeather.HistoricalMinTemperature}"
+            MaxValue="{x:Bind converters1:ConverterMethods.Max(HistoricalDailyWeather.HistoricalMaxTemperature,WeatherToday.MaxTemperature)}"
+            MinValue="{x:Bind converters1:ConverterMethods.Min(HistoricalDailyWeather.HistoricalMinTemperature,WeatherToday.MinTemperature)}"
             TickStep="1"
             Visibility="{x:Bind HistoricalDailyWeather, Converter={StaticResource NullToVisibilityConverter}}">
             <dv:RadLinearGauge.TickTemplate>
@@ -150,9 +150,9 @@
 
 
             <!--  今日天气 指示条  -->
-            <dv:SegmentedLinearGaugeIndicator dv:RadLinearGauge.IndicatorOffset="12" Value="{x:Bind HistoricalDailyWeather.HistoricalMaxTemperature}">
+            <dv:SegmentedLinearGaugeIndicator dv:RadLinearGauge.IndicatorOffset="12" Value="{x:Bind converters1:ConverterMethods.Max(WeatherToday.MaxTemperature,HistoricalDailyWeather.HistoricalMaxTemperature)}">
                 <dv:BarIndicatorSegment
-                    Length="{x:Bind converters1:ConverterMethods.Subtract(WeatherToday.MinTemperature, HistoricalDailyWeather.HistoricalMinTemperature)}"
+                    Length="{x:Bind GetLength3Low(WeatherToday.MinTemperature, HistoricalDailyWeather.HistoricalMinTemperature)}"
                     Stroke="Transparent"
                     Thickness="4" />
 
@@ -161,7 +161,7 @@
                     Stroke="{ThemeResource HistoricalWeatherTodayRangeStroke}"
                     Thickness="4" />
                 <dv:BarIndicatorSegment
-                    Length="{x:Bind converters1:ConverterMethods.Subtract(HistoricalDailyWeather.HistoricalMaxTemperature, WeatherToday.MaxTemperature)}"
+                    Length="{x:Bind GetLength3High(HistoricalDailyWeather.HistoricalMaxTemperature, WeatherToday.MaxTemperature)}"
                     Stroke="Transparent"
                     Thickness="4" />
             </dv:SegmentedLinearGaugeIndicator>

diff --git a/FluentWeather.Uwp/Controls/HistoricalWeatherGauge.xaml.cs b/FluentWeather.Uwp/Controls/HistoricalWeatherGauge.xaml.cs
@@ -51,5 +51,21 @@ private async void DownloadDataButton_Click(object sender, RoutedEventArgs e)
         {
             await DialogManager.OpenDialogAsync(new HistoricalWeatherSetupDialog(Common.Settings.DefaultGeolocation));
         }
+
+        public bool IsHighTemperatureBreakRecord => WeatherToday?.MaxTemperature > HistoricalDailyWeather?.HistoricalMaxTemperature;
+        public bool IsLowTemperatureBreakRecord => WeatherToday?.MinTemperature < HistoricalDailyWeather?.HistoricalMinTemperature;
+
+        private int GetLength3High(int num1,int num2)
+        {
+            if (IsHighTemperatureBreakRecord) return 0;
+            return num1 - num2;
+        }
+
+        private int GetLength3Low(int num1, int num2)
+        {
+            if (IsLowTemperatureBreakRecord) return 0;
+            return num1 - num2;
+        }
+
     }
 }
diff --git a/FluentWeather.Uwp/Themes/Generic.xaml b/FluentWeather.Uwp/Themes/Generic.xaml
@@ -36,10 +36,10 @@
             <StaticResource x:Key="InfoBarInformationalSeverityBackgroundBrush" ResourceKey="SystemControlAcrylicElementBrush" />
             <SolidColorBrush x:Key="HistoricalWeatherAverageRangeStroke" Color="#80B3B3B3" />
             <SolidColorBrush x:Key="HistoricalWeatherBaseRangeStroke" Color="#21BFBFBF" />
-            <SolidColorBrush x:Key="HistoricalWeatherTodayRangeStroke" Color="#66808080" />
-            <SolidColorBrush x:Key="HistoricalWeatherHighestLowestPointFill" Color="#FF666666" />
+            <SolidColorBrush x:Key="HistoricalWeatherTodayRangeStroke" Color="#40BFBFBF" />
+            <SolidColorBrush x:Key="HistoricalWeatherHighestLowestPointFill" Color="#99B3B3B3" />
             <SolidColorBrush x:Key="HistoricalWeatherAveragePointFill" Color="#FFCCCCCC" />
-            <SolidColorBrush x:Key="HistoricalWeatherTodayPointFill" Color="#FF808080" />
+            <SolidColorBrush x:Key="HistoricalWeatherTodayPointFill" Color="#B3CCCCCC" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>