返回提交历史
Modified
XFENewsApplication.Core/Models/NewsSource.cs
+2
-0
Modified
XFENewsApplication.Core/Utilities/Helpers/ClimbHelper.cs
+8
-4
Modified
XFENewsApplication/Views/HotSearchViewPage.xaml
+8
-20
XFEstudio/XFENewsApplication
修复热搜图片显示bug
51c7725
代码差异
3 个文件
+18
-24
@@ -9,6 +9,8 @@ public class NewsSource
9
9
public string? PublishTime { get; set; }
10
10
public string? Abstract { get; set; }
11
11
public string? ImageUrl { get; set; }
12
public int ImageWidth { get; set; }
13
public int ImageHeight { get; set; }
12
14
public int Index { get; set; }
13
15
public string Source { get; set; } = string.Empty;
14
16
}
@@ -131,7 +131,7 @@ public static class ClimbHelper
131
131
132
132
public static async Task<NewsResult> ClimbWeiboHotSearch(CancellationToken cancellationToken)
133
133
{
134
int index = 0;
134
int index = 1;
135
135
string message = "Success";
136
136
var resultList = new List<NewsSource>();
137
137
try
@@ -147,8 +147,10 @@ public static class ClimbHelper
147
147
Title = Regex.Unescape(node["desc"].ToString()),
148
148
Abstract = Regex.Unescape(desc_extr.ToString()),
149
149
Source = "微博热搜",
150
ImageWidth = 30,
151
ImageHeight = 30,
150
152
Index = index++,
151
ImageUrl = node.TryGetValue("icon", out var icon) ? icon.ToString() : string.Empty
153
ImageUrl = node.TryGetValue("icon", out var icon) ? Regex.Unescape(icon.ToString()) : string.Empty
152
154
});
153
155
}
154
156
}
@@ -167,7 +169,7 @@ public static class ClimbHelper
167
169
168
170
public static async Task<NewsResult> ClimbBilibiliHotSearch(CancellationToken cancellationToken)
169
171
{
170
int index = 0;
172
int index = 1;
171
173
string message = "Success";
172
174
var resultList = new List<NewsSource>();
173
175
try
@@ -182,8 +184,10 @@ public static class ClimbHelper
182
184
Title = node["keyword"].ToString(),
183
185
Abstract = node["heat_score"].ToString(),
184
186
Source = "B站热搜",
187
ImageWidth = 18,
188
ImageHeight = 18,
185
189
Index = index++,
186
ImageUrl = node.TryGetValue("icon", out var icon) ? icon.ToString() : string.Empty
190
ImageUrl = node.TryGetValue("icon", out var icon) ? Regex.Unescape(icon.ToString()) : string.Empty
187
191
});
188
192
}
189
193
}
@@ -15,32 +15,20 @@
15
15
16
16
<Grid>
17
17
<ListView ItemsSource="{x:Bind ViewModel.HotSearchSource}" IsDoubleTapEnabled="True" DoubleTapped="ListView_DoubleTapped">
18
<ListView.Header>
19
<Grid>
20
<Grid.ColumnDefinitions>
21
<ColumnDefinition Width="50"/>
22
<ColumnDefinition Width="*"/>
23
<ColumnDefinition Width="120"/>
24
<ColumnDefinition Width="50"/>
25
</Grid.ColumnDefinitions>
26
<TextBlock Text="排名"/>
27
<TextBlock Grid.Column="1" Text="内容"/>
28
<TextBlock Grid.Column="2" Text="热度"/>
29
</Grid>
30
</ListView.Header>
31
18
<ListView.ItemTemplate>
32
19
<DataTemplate x:DataType="coremodel:NewsSource">
33
20
<Grid>
34
21
<Grid.ColumnDefinitions>
35
<ColumnDefinition Width="50"/>
22
<ColumnDefinition Width="30"/>
23
<ColumnDefinition Width="30"/>
36
24
<ColumnDefinition Width="*"/>
37
<ColumnDefinition Width="120"/>
38
<ColumnDefinition Width="50"/>
39
25
</Grid.ColumnDefinitions>
40
<TextBlock Text="{x:Bind Index}"/>
41
<TextBlock Grid.Column="1" Text="{x:Bind Title}"/>
42
<TextBlock Grid.Column="2" Text="{x:Bind Abstract}"/>
43
<Image Grid.Column="3" Source="{x:Bind ImageUrl, Converter={StaticResource URLImageConverter}}"/>
26
<TextBlock Text="{x:Bind Index}" VerticalAlignment="Center" FontSize="18"/>
27
<Image MaxWidth="{x:Bind ImageWidth}" Height="{x:Bind ImageHeight}" Grid.Column="1" Source="{x:Bind ImageUrl, Converter={StaticResource URLImageConverter}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
28
<StackPanel Orientation="Horizontal" Grid.Column="2" Spacing="10" VerticalAlignment="Center">
29
<TextBlock Text="{x:Bind Title}" VerticalAlignment="Center" FontSize="15"/>
30
<TextBlock Text="{x:Bind Abstract}" VerticalAlignment="Center" Foreground="{ThemeResource TextFillColorDisabled}"/>
31
</StackPanel>
44
32
</Grid>
45
33
</DataTemplate>
46
34
</ListView.ItemTemplate>