From bfa3d38b07c5fde7ea1b3bb205ea33f4e300041e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minecraft=E4=B8=80=E8=A7=92=E9=92=B1?= <122196845+MinecraftYJQ@users.noreply.github.com> Date: Fri, 18 Jul 2025 00:02:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=8F=90=E4=BA=A4=E4=B8=AA?= =?UTF-8?q?=E5=82=BB=E9=80=BC=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PCL.Neo/App.axaml.cs | 3 +++ PCL.Neo/ViewModels/MainWindowViewModel.cs | 4 +++- PCL.Neo/ViewModels/Online/OnlineSubViewModel.cs | 9 +++++++++ PCL.Neo/ViewModels/Online/OnlineViewModel.cs | 9 +++++++++ PCL.Neo/Views/MainWindow.axaml | 2 +- PCL.Neo/Views/Online/OnlineSubView.axaml | 14 ++++++++++++++ PCL.Neo/Views/Online/OnlineSubView.axaml.cs | 14 ++++++++++++++ PCL.Neo/Views/Online/OnlineView.axaml | 11 +++++++++++ PCL.Neo/Views/Online/OnlineView.axaml.cs | 14 ++++++++++++++ 9 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 PCL.Neo/ViewModels/Online/OnlineSubViewModel.cs create mode 100644 PCL.Neo/ViewModels/Online/OnlineViewModel.cs create mode 100644 PCL.Neo/Views/Online/OnlineSubView.axaml create mode 100644 PCL.Neo/Views/Online/OnlineSubView.axaml.cs create mode 100644 PCL.Neo/Views/Online/OnlineView.axaml create mode 100644 PCL.Neo/Views/Online/OnlineView.axaml.cs diff --git a/PCL.Neo/App.axaml.cs b/PCL.Neo/App.axaml.cs index 7232686..4697006 100644 --- a/PCL.Neo/App.axaml.cs +++ b/PCL.Neo/App.axaml.cs @@ -11,7 +11,9 @@ using PCL.Neo.Services; using PCL.Neo.ViewModels; using PCL.Neo.ViewModels.Home; +using PCL.Neo.ViewModels.Online; using PCL.Neo.Views; +using PCL.Neo.Views.Online; using System; using System.Linq; using System.Threading.Tasks; @@ -33,6 +35,7 @@ private static IServiceProvider ConfigureServices() return new ServiceCollection() .AddTransient() .AddTransient().AddTransient() + .AddTransient().AddTransient() .AddSingleton() .AddSingleton() diff --git a/PCL.Neo/ViewModels/MainWindowViewModel.cs b/PCL.Neo/ViewModels/MainWindowViewModel.cs index 4160288..ee14c8a 100644 --- a/PCL.Neo/ViewModels/MainWindowViewModel.cs +++ b/PCL.Neo/ViewModels/MainWindowViewModel.cs @@ -9,6 +9,8 @@ using PCL.Neo.Messages; using PCL.Neo.Services; using PCL.Neo.ViewModels.Home; +using PCL.Neo.ViewModels.Online; +using PCL.Neo.Views.Online; using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -155,7 +157,7 @@ public async Task Navigate(int tag) case 2: break; case 3: - // NavigationService.Goto(); + NavigationService.GoToAsync(); break; case 4: break; diff --git a/PCL.Neo/ViewModels/Online/OnlineSubViewModel.cs b/PCL.Neo/ViewModels/Online/OnlineSubViewModel.cs new file mode 100644 index 0000000..e0a67ab --- /dev/null +++ b/PCL.Neo/ViewModels/Online/OnlineSubViewModel.cs @@ -0,0 +1,9 @@ +using PCL.Neo.Services; + +namespace PCL.Neo.ViewModels.Online; + +[SubViewModel(typeof(OnlineViewModel))] +public class OnlineSubViewModel : ViewModelBase +{ + private readonly INavigationService _navigationService; +} diff --git a/PCL.Neo/ViewModels/Online/OnlineViewModel.cs b/PCL.Neo/ViewModels/Online/OnlineViewModel.cs new file mode 100644 index 0000000..fe8d36c --- /dev/null +++ b/PCL.Neo/ViewModels/Online/OnlineViewModel.cs @@ -0,0 +1,9 @@ +using PCL.Neo.Services; + +namespace PCL.Neo.ViewModels.Online; + +[MainViewModel(typeof(OnlineSubViewModel))] +public class OnlineViewModel : ViewModelBase +{ + private readonly INavigationService _navigationService; +} diff --git a/PCL.Neo/Views/MainWindow.axaml b/PCL.Neo/Views/MainWindow.axaml index ec64e28..ae3b993 100644 --- a/PCL.Neo/Views/MainWindow.axaml +++ b/PCL.Neo/Views/MainWindow.axaml @@ -239,7 +239,7 @@ Margin="5,0" Name="BtnTitleSelect0" Padding="2,0" - Tag="0" + Tag="1" Text="{DynamicResource LangTitleHome}" /> + + + + + diff --git a/PCL.Neo/Views/Online/OnlineSubView.axaml.cs b/PCL.Neo/Views/Online/OnlineSubView.axaml.cs new file mode 100644 index 0000000..07e3321 --- /dev/null +++ b/PCL.Neo/Views/Online/OnlineSubView.axaml.cs @@ -0,0 +1,14 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace PCL.Neo.Views.Online; + +public partial class OnlineSubView : UserControl +{ + public OnlineSubView() + { + InitializeComponent(); + } +} + diff --git a/PCL.Neo/Views/Online/OnlineView.axaml b/PCL.Neo/Views/Online/OnlineView.axaml new file mode 100644 index 0000000..3f122fc --- /dev/null +++ b/PCL.Neo/Views/Online/OnlineView.axaml @@ -0,0 +1,11 @@ + + + + diff --git a/PCL.Neo/Views/Online/OnlineView.axaml.cs b/PCL.Neo/Views/Online/OnlineView.axaml.cs new file mode 100644 index 0000000..c8a6581 --- /dev/null +++ b/PCL.Neo/Views/Online/OnlineView.axaml.cs @@ -0,0 +1,14 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace PCL.Neo.Views.Online; + +public partial class OnlineView : UserControl +{ + public OnlineView() + { + InitializeComponent(); + } +} + From 94098cea413991b14a4902b11c77173b566b8920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minecraft=E4=B8=80=E8=A7=92=E9=92=B1?= <122196845+MinecraftYJQ@users.noreply.github.com> Date: Fri, 18 Jul 2025 00:35:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E4=B8=BA=20PCL=20=E8=80=8C=E4=B8=8D=E6=98=AF=20PCL=20?= =?UTF-8?q?II?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PCL.Neo/Styles/Icons.axaml | 2 +- PCL.Neo/ViewModels/MainWindowViewModel.cs | 5 +++-- PCL.Neo/Views/MainWindow.axaml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PCL.Neo/Styles/Icons.axaml b/PCL.Neo/Styles/Icons.axaml index efa6449..e9c4e0f 100644 --- a/PCL.Neo/Styles/Icons.axaml +++ b/PCL.Neo/Styles/Icons.axaml @@ -9,7 +9,7 @@