加入启动加载

Dime12022 · Dime12022 · commit 1d75e4fedc70 · 2025-01-26T13:48:27.000+08:00
diff --git a/EncodeCalculator.SuffixExpressionsCalculating/EncodeCalculator.SuffixExpressionsCalculating.csproj b/EncodeCalculator.SuffixExpressionsCalculating/EncodeCalculator.SuffixExpressionsCalculating.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0" />
     <PackageReference Include="Downloader" Version="3.3.3" />
   </ItemGroup>
 
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator.Desktop/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.csproj b/Round.NET.AvaloniaApp.EncodeCalculator.Desktop/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
     <PackageReference Include="Downloader" Version="3.3.3" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.2.0" />
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator/App.axaml b/Round.NET.AvaloniaApp.EncodeCalculator/App.axaml
@@ -10,4 +10,22 @@
         <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml"/>
         <styling:FluentAvaloniaTheme />
     </Application.Styles>
+             <TrayIcon.Icons>
+                 <TrayIcons>
+                     <TrayIcon Icon="/Assets/Icon.ico" ToolTipText="Avalonia Tray Icon ToolTip">
+                         <TrayIcon.Menu>
+                             <NativeMenu>
+                                 <NativeMenuItem Header="Settings">
+                                     <NativeMenu>
+                                         <NativeMenuItem Header="Option 1" />
+                                         <NativeMenuItem Header="Option 2" />
+                                         <NativeMenuItemSeparator />
+                                         <NativeMenuItem Header="Option 3" />
+                                     </NativeMenu>
+                                 </NativeMenuItem>
+                             </NativeMenu>
+                         </TrayIcon.Menu>
+                     </TrayIcon>
+                 </TrayIcons>
+             </TrayIcon.Icons>
 </Application>
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator/App.axaml.cs b/Round.NET.AvaloniaApp.EncodeCalculator/App.axaml.cs
@@ -1,7 +1,7 @@
 ﻿using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-
+using ReactiveUI;
 using Round.NET.AvaloniaApp.EncodeCalculator.Views;
 
 namespace Round.NET.AvaloniaApp.EncodeCalculator;
@@ -23,7 +23,6 @@ public override void OnFrameworkInitializationCompleted()
         {
             singleViewPlatform.MainView = new MainWindow();
         }
-
         base.OnFrameworkInitializationCompleted();
     }
 }
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator/Views/Pages/LoadPage.axaml.cs b/Round.NET.AvaloniaApp.EncodeCalculator/Views/Pages/LoadPage.axaml.cs
@@ -27,6 +27,8 @@ public LoadPage()
                 // 使用HttpClient获取JSON文件内容
                 using HttpClient client = new HttpClient();
                 string jsonString = client.GetStringAsync(url).Result;
+                
+                Console.WriteLine(jsonString);
             }
             catch (Exception ex)
             {
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator/Views/Pages/MainView.axaml b/Round.NET.AvaloniaApp.EncodeCalculator/Views/Pages/MainView.axaml
@@ -8,7 +8,7 @@
              xmlns:controls1="clr-namespace:HeroIconsAvalonia.Controls;assembly=HeroIconsAvalonia"
              x:Class="Round.NET.AvaloniaApp.EncodeCalculator.Views.MainView">
     <Grid>
-         <Border Background="rgb(40,40,40)" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,10,350,10" CornerRadius="6">
+        <Border Background="rgb(40,40,40)" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,10,350,10" CornerRadius="6">
              <DockPanel Height="40">
                  <Image Source="../../Assets/Icon.png" Margin="8"></Image>
                  <Menu HorizontalAlignment="Stretch" VerticalAlignment="Center">
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator/Views/Windows/MainWindow.axaml b/Round.NET.AvaloniaApp.EncodeCalculator/Views/Windows/MainWindow.axaml
@@ -15,5 +15,5 @@
         x:Class="Round.NET.AvaloniaApp.EncodeCalculator.Views.MainWindow"
         Icon="/Assets/Icon.ico"
         Title="REC - 可编码计算器">
-        <views:MainView />
+        <pages:LoadPage />
 </Window>
diff --git a/Round.NET.AvaloniaApp.EncodeCalculator/Views/Windows/MainWindow.axaml.cs b/Round.NET.AvaloniaApp.EncodeCalculator/Views/Windows/MainWindow.axaml.cs
@@ -1,20 +1,26 @@
 ﻿using System;
 using System.Reactive.Disposables;
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using EncodeCalculator.SuffixExpressionsCalculating;
 using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
+using ReactiveUI;
 using Round.NET.AvaloniaApp.EncodeCalculator.Models;
 using Round.NET.AvaloniaApp.EncodeCalculator.Models.Config;
 using Round.NET.AvaloniaApp.EncodeCalculator.Models.ItemManage.ProjectMange;
 using Round.NET.AvaloniaApp.EncodeCalculator.Models.Mange.TaskMange;
 using Round.NET.AvaloniaApp.EncodeCalculator.Models.Update;
+using Round.NET.AvaloniaApp.EncodeCalculator.Views.Pages;
 
 namespace Round.NET.AvaloniaApp.EncodeCalculator.Views;
 
-public partial class MainWindow : Window
+public partial class MainWindow : AppWindow
 {
     public WindowNotificationManager? _manager;
     public MainWindow()
@@ -27,7 +33,7 @@ public MainWindow()
         {
             UpdateFunc();
         }
-
+        
         // BackUpdate.RefreshUpdateConfig();
         
         _manager = new WindowNotificationManager(this)
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
       <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
+      <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0" />
       <PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
       <PackageReference Include="Downloader" Version="3.3.3" />
       <PackageReference Include="HeroIcons.Avalonia" Version="1.0.2" />

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Avalonia;`
`2`	`2`	`using Avalonia.Controls.ApplicationLifetimes;`
`3`	`3`	`using Avalonia.Markup.Xaml;`
`4`		`-`
	`4`	`+using ReactiveUI;`
`5`	`5`	`using Round.NET.AvaloniaApp.EncodeCalculator.Views;`
`6`	`6`
`7`	`7`	`namespace Round.NET.AvaloniaApp.EncodeCalculator;`
`@@ -23,7 +23,6 @@ public override void OnFrameworkInitializationCompleted()`
`23`	`23`	`{`
`24`	`24`	`singleViewPlatform.MainView = new MainWindow();`
`25`	`25`	`}`
`26`		`-`
`27`	`26`	`base.OnFrameworkInitializationCompleted();`
`28`	`27`	`}`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ public LoadPage()`
`27`	`27`	`// 使用HttpClient获取JSON文件内容`
`28`	`28`	`using HttpClient client = new HttpClient();`
`29`	`29`	`string jsonString = client.GetStringAsync(url).Result;`
	`30`	`+`
	`31`	`+ Console.WriteLine(jsonString);`
`30`	`32`	`}`
`31`	`33`	`catch (Exception ex)`
`32`	`34`	`{`