Skip to content

Commit 52357af

Browse files
author
yangzhiqin
committed
Merge branch 'master' of https://github.com/qedsd/omdb 
2 parents 3b80faf + 45abf63 commit 52357af

32 files changed

+299
-310
lines changed

‎OMDb.Core/Helpers/ImageHelper.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
using ImageMagick;
2-
using OMDb.Core.Const;
1+
using OMDb.Core.Const;
32
using OMDb.Core.Models;
43
using OMDb.Core.Services;
54
using OMDb.Core.Utils.Extensions;
6-
using SixLabors.ImageSharp;
7-
using SixLabors.ImageSharp.PixelFormats;
8-
using SixLabors.ImageSharp.Processing;
9-
using SixLabors.ImageSharp.Processing.Processors;
105
using System.Net;
6+
using ImageInfo = OMDb.Core.Models.ImageInfo;
117

128
namespace OMDb.Core.Helpers
139
{
@@ -17,12 +13,12 @@ public static void GetImageSize(string path, out double Wpx, out double Hpx)
1713
{
1814
try
1915
{
20-
MagickImageInfo image = new MagickImageInfo(path);
16+
ImageMagick.MagickImageInfo image = new ImageMagick.MagickImageInfo(path);
2117
int w = image.Width;//宽
2218
int h = image.Height;//高
2319
Wpx = image.Density.X;//分辨率
2420
Hpx = image.Density.Y;//分辨率
25-
if (image.Density.Units == DensityUnit.PixelsPerCentimeter)//判断分辨率单位
21+
if (image.Density.Units == ImageMagick.DensityUnit.PixelsPerCentimeter)//判断分辨率单位
2622
{
2723
Wpx *= 2.54;
2824
Hpx *= 2.54;
@@ -38,7 +34,7 @@ public static ImageInfo GetImageInfo(string path)
3834
try
3935
{
4036
ImageInfo imageInfo = new ImageInfo();
41-
MagickImageInfo image = new MagickImageInfo(path);
37+
ImageMagick.MagickImageInfo image = new ImageMagick.MagickImageInfo(path);
4238
imageInfo.Width = image.Width;
4339
imageInfo.Height = image.Height;
4440
imageInfo.FullPath = path;

‎OMDb.Core/Helpers/RandomHelper.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Google.Protobuf.WellKnownTypes;
2-
using Org.BouncyCastle.Utilities;
3-
using System;
1+
using System;
42
using System.Collections.Generic;
53
using System.Linq;
64
using System.Security.Cryptography;

‎OMDb.Core/OMDb.Core.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88

99
<ItemGroup>
1010
<PackageReference Include="DotNetCore.NPOI" Version="1.2.3" />
11-
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
12-
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="12.2.1" />
13-
<PackageReference Include="Magick.NET.Core" Version="12.2.1" />
14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
15-
<PackageReference Include="NLog" Version="5.1.2" />
16-
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
17-
<PackageReference Include="SqlSugarCore" Version="5.1.3.34" />
11+
<PackageReference Include="HtmlAgilityPack" Version="1.11.49" />
12+
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.1.3" />
13+
<PackageReference Include="Magick.NET.Core" Version="13.1.3" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
15+
<PackageReference Include="NLog" Version="5.2.2" />
16+
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
17+
<PackageReference Include="SqlSugarCore" Version="5.1.4.91" />
1818
<PackageReference Include="System.Composition.AttributedModel" Version="7.0.0" />
1919
<PackageReference Include="System.Composition.Convention" Version="7.0.0" />
2020
<PackageReference Include="System.Composition.TypedParts" Version="7.0.0" />
21-
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
22-
<PackageReference Include="Xabe.FFmpeg" Version="5.2.0" />
21+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
22+
<PackageReference Include="Xabe.FFmpeg" Version="5.2.6" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎OMDb.Core/Services/DbService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Linq;
99
using System.Text;
1010
using System.Threading.Tasks;
11-
using static Org.BouncyCastle.Math.EC.ECCurve;
1211

1312
namespace OMDb.Core.Services
1413
{

‎OMDb.Core/Utils/Logger.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Google.Protobuf.WellKnownTypes;
2-
using Org.BouncyCastle.Utilities;
3-
using System;
1+
using System;
42
using System.Collections.Generic;
53
using System.Linq;
64
using System.Security.Cryptography;

‎OMDb.Douban/OMDb.Douban.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
12-
<PackageReference Include="NLog" Version="5.1.2" />
11+
<PackageReference Include="HtmlAgilityPack" Version="1.11.49" />
12+
<PackageReference Include="NLog" Version="5.2.2" />
1313
<PackageReference Include="System.Composition.AttributedModel" Version="7.0.0" />
1414
</ItemGroup>
1515

‎OMDb.WinUI3/OMDb.WinUI3/App.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
x:Class="OMDb.WinUI3.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:converters="using:OMDb.WinUI3.Converters"
56
xmlns:local="using:OMDb.WinUI3">
67
<Application.Resources>
78
<ResourceDictionary>
@@ -18,6 +19,9 @@
1819
<x:Double x:Key="ContentDialogMaxWidth">1000</x:Double>
1920
<x:Double x:Key="ContentDialogMinWidth">10</x:Double>
2021
<x:Double x:Key="ContentDialogMinHeight">10</x:Double>
22+
<converters:BoolToVisibilityConverter x:Key="TrueToVisibleConverter" />
23+
<converters:BoolToVisibilityConverter x:Key="FalseToVisibleConverter" IsReverse="True" />
24+
<converters:BoolReverseConverte x:Key="BoolReverseConverte" />
2125
</ResourceDictionary>
2226
</Application.Resources>
2327
</Application>

‎OMDb.WinUI3/OMDb.WinUI3/Assets/Img/logo_32.png

194 Bytes
Loading

‎OMDb.WinUI3/OMDb.WinUI3/Converters/BoolToVisibilityConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
3030
{
3131
return Visibility.Collapsed;
3232
}
33-
if ((bool)value)
33+
if (value.GetType() == typeof(bool) && (bool)value)
3434
{
3535
return IsReverse ? Visibility.Collapsed : Visibility.Visible;
3636
}

‎OMDb.WinUI3/OMDb.WinUI3/Dialogs/AddEntryBatchDialog.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
using OMDb.WinUI3.Services;
1919
using OMDb.WinUI3.Services.Settings;
2020
using OMDb.WinUI3.ViewModels;
21-
using Org.BouncyCastle.Utilities;
2221
using System;
2322
using System.Collections.Generic;
2423
using System.Collections.ObjectModel;

‎OMDb.WinUI3/OMDb.WinUI3/Helpers/WindowHelper.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.UI.Xaml;
2+
using System;
23
using System.Collections.Generic;
34

45
namespace OMDb.WinUI3.Helpers
@@ -45,6 +46,15 @@ public static void SetMainWindow(Window window)
4546
{
4647
MainWindow = window;
4748
}
48-
49+
public static IntPtr GetWindowHandle(Window window)
50+
{
51+
return WinRT.Interop.WindowNative.GetWindowHandle(window);
52+
}
53+
public static Microsoft.UI.Windowing.AppWindow GetAppWindow(Window window)
54+
{
55+
var hWnd = GetWindowHandle(window);
56+
Microsoft.UI.WindowId windowId = Microsoft.UI.Win32Interop.GetWindowIdFromWindow(hWnd);
57+
return Microsoft.UI.Windowing.AppWindow.GetFromWindowId(windowId);
58+
}
4959
}
5060
}

‎OMDb.WinUI3/OMDb.WinUI3/MyControls/StorageCard.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using OMDb.WinUI3.Helpers;
1010
using OMDb.WinUI3.Models;
1111
using OMDb.WinUI3.ViewModels;
12-
using Org.BouncyCastle.Asn1.X509;
1312
using System;
1413
using System.Collections.Generic;
1514
using System.IO;

‎OMDb.WinUI3/OMDb.WinUI3/OMDb.WinUI3.csproj

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
1010
<UseWinUI>true</UseWinUI>
1111
<BaseOutputPath>bin\</BaseOutputPath>
12+
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
13+
<!--package需注释掉-->
14+
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
15+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
16+
<WindowsPackageType>None</WindowsPackageType>
17+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
18+
<AssemblyName>OMDb</AssemblyName>
19+
<!--package需注释掉-->
1220
</PropertyGroup>
1321
<ItemGroup>
1422
<Compile Remove="Enums\**" />
@@ -94,13 +102,13 @@
94102
</ItemGroup>
95103

96104
<ItemGroup>
97-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
105+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
98106
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
99107
<PackageReference Include="DotNetCore.NPOI" Version="1.2.3" />
100-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221116.1" />
101-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
108+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
109+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
102110
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
103-
<PackageReference Include="Xabe.FFmpeg" Version="5.2.0" />
111+
<PackageReference Include="Xabe.FFmpeg" Version="5.2.6" />
104112
<Manifest Include="$(ApplicationManifest)" />
105113
</ItemGroup>
106114

@@ -372,10 +380,20 @@
372380
<Folder Include="Assets\FFmpeg\" />
373381
</ItemGroup>
374382

383+
<ItemGroup>
384+
<None Include="Properties\PublishProfiles\win10-x64.pubxml.user" />
385+
</ItemGroup>
386+
375387
<ItemGroup>
376388
<Page Update="MyControls\ExplorerControl.xaml">
377389
<Generator>MSBuild:Compile</Generator>
378390
</Page>
391+
<None Update="Assets\Img\logo_32.png">
392+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
393+
</None>
394+
<None Update="logo_32.ico">
395+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
396+
</None>
379397
<None Update="nlog.config">
380398
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
381399
</None>

‎OMDb.WinUI3/OMDb.WinUI3/Properties/launchSettings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"profiles": {
3+
"OMDb": {
4+
"commandName": "Project"
5+
}
6+
}
7+
}

‎OMDb.WinUI3/OMDb.WinUI3/Services/ActivationService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class ActivationService
1010
{
1111
public static void Init()
1212
{
13-
Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = "zh-CN";
13+
//Windows.Globalization.ApplicationLanguages.PrimaryLanguageOverride = "zh-CN";
1414
ConfigService.Load();
1515
//SettingService.Load();
1616
RecentFileService.Init();

‎OMDb.WinUI3/OMDb.WinUI3/Services/ConfigService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Newtonsoft.Json;
33
using OMDb.WinUI3.Models;
44
using OMDb.WinUI3.Services.Settings;
5-
using Org.BouncyCastle.Utilities;
65
using System;
76
using System.Collections.Generic;
87
using System.Collections.ObjectModel;

‎OMDb.WinUI3/OMDb.WinUI3/Services/ExcelService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Google.Protobuf.WellKnownTypes;
2-
using ICSharpCode.SharpZipLib.Core;
1+
using ICSharpCode.SharpZipLib.Core;
32
using NPOI.OpenXmlFormats.Vml;
43
using NPOI.POIFS.FileSystem;
54
using NPOI.SS.Formula;

‎OMDb.WinUI3/OMDb.WinUI3/ViewModels/ClassificationViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using CommunityToolkit.Mvvm.Input;
33
using Microsoft.UI.Xaml.Media;
44
using Microsoft.UI.Xaml.Media.Imaging;
5-
using MySqlX.XDevAPI.Common;
65
using OMDb.Core.Enums;
76
using OMDb.Core.Helpers;
87
using OMDb.Core.Models;

‎OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelCollectionViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using CommunityToolkit.Mvvm.ComponentModel;
22
using CommunityToolkit.Mvvm.Input;
3-
using Google.Protobuf.WellKnownTypes;
43
using Microsoft.UI.Xaml.Controls;
54
using OMDb.Core.DbModels;
65
using OMDb.Core.Models;

‎OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelPropertyViewModel.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using CommunityToolkit.Mvvm.ComponentModel;
22
using CommunityToolkit.Mvvm.Input;
33
using Microsoft.UI.Xaml.Media;
4-
using MySqlX.XDevAPI.Common;
54
using Newtonsoft.Json;
65
using OMDb.WinUI3.Models;
76
using OMDb.WinUI3.Services;
@@ -14,7 +13,6 @@
1413
using System.Text;
1514
using System.Threading.Tasks;
1615
using System.Windows.Input;
17-
//using Microsoft.UI.Xaml.Media;
1816
using Microsoft.UI;
1917
using System.Xml.Linq;
2018
using Microsoft.UI.Xaml;
@@ -24,7 +22,6 @@
2422
using OMDb.WinUI3.Services.Settings;
2523
using System.ComponentModel.Design;
2624
using OMDb.Core.DbModels;
27-
using Org.BouncyCastle.Crypto;
2825

2926
namespace OMDb.WinUI3.ViewModels
3027
{

‎OMDb.WinUI3/OMDb.WinUI3/ViewModels/LabelViewModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using CommunityToolkit.Mvvm.ComponentModel;
22
using CommunityToolkit.Mvvm.Input;
33
using Microsoft.UI.Xaml.Media;
4-
using MySqlX.XDevAPI.Common;
54
using Newtonsoft.Json;
65
using OMDb.WinUI3.Models;
76
using OMDb.WinUI3.Services;
@@ -14,7 +13,6 @@
1413
using System.Text;
1514
using System.Threading.Tasks;
1615
using System.Windows.Input;
17-
//using Microsoft.UI.Xaml.Media;
1816
using Microsoft.UI;
1917
using System.Xml.Linq;
2018
using Microsoft.UI.Xaml;

‎OMDb.WinUI3/OMDb.WinUI3/ViewModels/ShellViewModel.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ public ShellViewModel()
2424
{
2525
Current = this;
2626
}
27+
28+
private bool isInTabView;
29+
public bool IsInTabView
30+
{
31+
get => isInTabView;
32+
set => SetProperty(ref isInTabView, value);
33+
}
34+
2735
private string selectedPage;
2836
public string SelectedPage
2937
{
@@ -34,12 +42,6 @@ public string SelectedPage
3442
}
3543
}
3644

37-
private bool canGoBack;
38-
public bool CanGoBack
39-
{
40-
get => canGoBack;
41-
set => SetProperty(ref canGoBack, value);
42-
}
4345
public void Init(Frame frame)
4446
{
4547
NavigationService.Frame = frame;
@@ -48,13 +50,11 @@ public void Init(Frame frame)
4850
public void GoBack()
4951
{
5052
NavigationService.GoBack();
51-
CanGoBack = NavigationService.CanGoBack;
5253
}
5354

5455
public void SetSelected(Type type)
5556
{
5657
SelectedPage = type.Name;
57-
CanGoBack = NavigationService.CanGoBack;
5858
}
5959

6060
public ICommand NavClickCommand => new RelayCommand<Button>((item) =>
@@ -63,7 +63,7 @@ public void SetSelected(Type type)
6363
if (pageType != null)
6464
{
6565
NavigationService.Navigate(pageType, null);
66-
CanGoBack = NavigationService.CanGoBack;
66+
IsInTabView = false;
6767
}
6868
});
6969
}

‎OMDb.WinUI3/OMDb.WinUI3/ViewModels/StorageViewModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using CommunityToolkit.Mvvm.ComponentModel;
22
using CommunityToolkit.Mvvm.Input;
3-
using Google.Protobuf.WellKnownTypes;
43
using Newtonsoft.Json;
54
using OMDb.Core.DbModels;
65
using OMDb.Core.Models;

‎OMDb.WinUI3/OMDb.WinUI3/Views/Management/LabelPropertyPage.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.UI.Xaml.Input;
66
using Microsoft.UI.Xaml.Media;
77
using Microsoft.UI.Xaml.Navigation;
8-
using MySqlX.XDevAPI.Common;
98
using OMDb.Core.Services;
109
using OMDb.Core.Utils;
1110
using OMDb.Core.Utils.Extensions;

0 commit comments

Comments
 (0)