提交

ToolsForm/.idea/.idea.ToolsForm/.idea/avalonia.xml

@@ -18,6 +18,7 @@
         <entry key="ToolsForm/Views/TemporaryStorage/TemporaryStorageWindow.axaml" value="ToolsForm/ToolsForm.csproj" />
         <entry key="ToolsForm/Views/TemporaryStorageMessage.axaml" value="ToolsForm/ToolsForm.csproj" />
         <entry key="ToolsForm/Views/TemporaryStorageWindow.axaml" value="ToolsForm/ToolsForm.csproj" />
+        <entry key="ToolsForm/Views/UploadExperimentMessageWindow.axaml" value="ToolsForm/ToolsForm.csproj" />
         <entry key="ToolsForm/Views/UploadExperimentWindow.axaml" value="ToolsForm/ToolsForm.csproj" />
         <entry key="ToolsForm/Views/UserControl.axaml" value="ToolsForm/ToolsForm.csproj" />
         <entry key="ToolsForm/Views/UserToggleControl.axaml" value="ToolsForm/ToolsForm.csproj" />

ToolsForm/.idea/.idea.ToolsForm/.idea/workspace.xml

@@ -8,11 +8,24 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="0ae961c9-2aa8-4465-9e53-e04d62044e0d" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/提交.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperimentMessage/成功.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperimentMessage/提交成功.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentMessageWindow.axaml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentMessageWindow.axaml.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2023-11-13_09-38-20_1600x900.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2023-11-14_14-33-14_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2023-11-14_14-33-16_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2024-10-24_14-08-47_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2024-10-24_14-08-48_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2024-10-24_17-48-17_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2024-10-24_17-48-24_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2024-10-24_17-48-29_1584x892.mp4" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/Captures/ScreenCapture_2024-10-24_17-51-32_1584x892.mp4" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.ToolsForm/.idea/avalonia.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.ToolsForm/.idea/avalonia.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.ToolsForm/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.ToolsForm/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/Assets/img/检测中-悬浮.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ToolsForm/Manager/AppWindowManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Manager/AppWindowManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/Views/ExperimentWindow.axaml" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/ExperimentWindow.axaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ToolsForm/ToolsForm.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/ToolsForm.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/Views/ExperimentWindow.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/ExperimentWindow.axaml.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ToolsForm/Views/IDEWindow2.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/IDEWindow2.axaml.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/ToolsForm.dll" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/ToolsForm.dll" afterDir="false" />
@@ -24,6 +37,8 @@
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/Avalonia/resources" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/Avalonia/resources" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.AssemblyInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.AssemblyInfo.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.AssemblyInfoInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.AssemblyInfoInputs.cache" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.GeneratedMSBuildEditorConfig.editorconfig" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.GeneratedMSBuildEditorConfig.editorconfig" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.csproj.CoreCompileInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.csproj.CoreCompileInputs.cache" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.dll" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.dll" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.pdb" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/apphost.exe" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/apphost.exe" afterDir="false" />
@@ -144,7 +159,7 @@
       <workItem from="1729819752329" duration="7261000" />
       <workItem from="1729835370931" duration="39273000" />
       <workItem from="1730253804607" duration="6537000" />
-      <workItem from="1730270228361" duration="29342000" />
+      <workItem from="1730270228361" duration="34212000" />
     </task>
     <servers />
   </component>

ToolsForm/ToolsForm/Manager/AppWindowManager.cs

@@ -32,6 +32,7 @@ namespace ToolsForm.Models
         public static DownCodeWindow? DownCodeWindow; //暂存
         public static ExperimentWindow? ExperimentWindow; //暂存
         public static UploadExperimentWindow? UploadExperimentWindow; //暂存
+        public static UploadExperimentMessageWindow? UploadExperimentMessageWindow; //暂存
 
         /// <summary>
         /// 创建窗口
@@ -155,6 +156,9 @@ namespace ToolsForm.Models
             CloseWindow(ref ReadCodeWindow);
             CloseWindow(ref DownCodeWindow);
             CloseWindow(ref IdeErrorWindow);
+            CloseWindow(ref UploadExperimentMessageWindow);
         }
+        
+        
     }
 }

ToolsForm/ToolsForm/ToolsForm.csproj

@@ -18,6 +18,7 @@
         <Folder Include="Assets\img\Recording\" />
         <Folder Include="Assets\img\ResetScene\" />
         <Folder Include="Assets\img\TemporaryStorage\" />
+        <Folder Include="Assets\img\UploadExperimentMessage\" />
         <Folder Include="Assets\img\UploadExperiment\" />
     </ItemGroup>
 

ToolsForm/ToolsForm/Views/IDEWindow2.axaml.cs

@@ -12,16 +12,15 @@ public partial class IDEWindow2 : Window
     public IDEWindow2()
     {
         InitializeComponent();
-        
-        Topmost = true;
 
+        Topmost = true;
     }
 
     private void SettingPathButton_OnClick(object? sender, RoutedEventArgs e)
     {
         AppWindowManager.IdeWindow = new IDEWindow();
         AppWindowManager.IdeWindow.Show();
-        
+
         // 使用 Screens API 获取屏幕的缩放因子
         var screen = Screens.ScreenFromWindow(this);
         var scalingFactor = screen?.PixelDensity ?? 2;
@@ -33,12 +32,11 @@ public partial class IDEWindow2 : Window
 
         // 设置新窗口的位置，确保它紧贴主窗口的右侧
         AppWindowManager.IdeWindow.Position = new PixelPoint(
-            (int)(mainWindowPosition.X ),
+            (int)(mainWindowPosition.X),
             mainWindowPosition.Y
         );
 
 
-        
         this.Close();
     }
 
@@ -61,15 +59,18 @@ public partial class IDEWindow2 : Window
             // image.Text = result;
             AppDataManager.IdeModel.FolderPath = result;
             Console.WriteLine(result);
-            
         }
     }
 
     private void RunButton_OnClick(object? sender, RoutedEventArgs e)
     {
-          
+        WebSocketManager.GetInstance().SendMessage(ToolsEventEnum.IDESettings, AppDataManager.IdeModel);
-        WebSocketManager.GetInstance().SendMessage(ToolsEventEnum.IDESettings,AppDataManager.IdeModel);
+
-        
+        AppWindowManager.ToggleWindow(ref AppWindowManager.ExperimentWindow, () => new ExperimentWindow(), false, false);
-         AppWindowManager.CloseWindow(ref AppWindowManager.IdeWindow2);
+        var mainWindowPosition = AppWindowManager.MainWindow.Position;
+        AppWindowManager.ExperimentWindow.Position = new PixelPoint(mainWindowPosition.X, mainWindowPosition.Y);
+        AppWindowManager.MainWindow.Hide();
+
+        AppWindowManager.CloseWindow(ref AppWindowManager.IdeWindow2);
     }
 }

ToolsForm/ToolsForm/Views/UploadExperimentMessageWindow.axaml

@@ -0,0 +1,42 @@
+<Window
+    Title="UploadExperimentMessageWindow"
+    d:DesignHeight="202"
+    d:DesignWidth="453"
+    mc:Ignorable="d"
+    x:Class="ToolsForm.Views.UploadExperimentMessageWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+    <Window.Styles>
+        <Style Selector="Window">
+            <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+            <Setter Property="ExtendClientAreaChromeHints" Value="NoChrome" />
+            <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
+            <Setter Property="SystemDecorations" Value="None" />
+            <Setter Property="CanResize" Value="False" />
+            <Setter Property="Background" />
+            <Setter Property="Width" Value="453" />
+            <Setter Property="Height" Value="202" />
+        </Style>
+    </Window.Styles>
+
+    <Canvas>
+        <Image Source="../Assets/img/UploadExperimentMessage/提交成功.png" />
+
+        <Image
+            Canvas.Left="140"
+            Canvas.Top="75"
+            Source="../Assets/img/UploadExperimentMessage/成功.png" />
+
+
+        <TextBlock
+            Canvas.Left="180"
+            Canvas.Top="74"
+            FontFamily="{StaticResource SourceMedium}"
+            FontSize="23"
+            Text="提交成功！" />
+    </Canvas>
+</Window>

ToolsForm/ToolsForm/Views/UploadExperimentMessageWindow.axaml.cs

@@ -0,0 +1,25 @@
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ToolsForm.Models;
+
+namespace ToolsForm.Views;
+
+public partial class UploadExperimentMessageWindow : Window
+{
+    public UploadExperimentMessageWindow()
+    {
+        InitializeComponent();
+
+        CloseWindow();
+    }
+
+
+    public async void CloseWindow()
+    {
+        await Task.Delay(2000);
+        
+        AppWindowManager.CloseWindow(ref AppWindowManager.UploadExperimentMessageWindow);
+    }
+}

ToolsForm/ToolsForm/Views/UploadExperimentWindow.axaml

@@ -96,15 +96,17 @@
             Text="实验视频" />
 
 
+        <!--  202410080926      02:31  -->
         <TextBlock
-            Canvas.Left="370"
+            Canvas.Left="500"
             Canvas.Top="150"
             FontFamily="{StaticResource SourceNormal}"
             FontSize="13"
             Foreground="#B181FF"
-            Text="202410080926      02:31"
+            Text=""
             x:Name="VideoTextBlockName" />
 
+
         <Image
             Canvas.Left="40"
             Canvas.Top="185"

ToolsForm/ToolsForm/Views/UploadExperimentWindow.axaml.cs

@@ -119,8 +119,8 @@ public partial class UploadExperimentWindow : Window
 
         var dirTextBlock = new TextBlock
         {
-            Text = $"{dir.Name} ({dir.FullName})", // 添加完整路径
+            Text = $"{dir.Name} ({dir.FullName})", 
-            FontFamily = new FontFamily("YourFontFamily"),
+            // FontFamily = new FontFamily("YourFontFamily"),
             FontSize = 15,
             TextWrapping = TextWrapping.Wrap
         };
@@ -134,7 +134,7 @@ public partial class UploadExperimentWindow : Window
         var itemPanel = new StackPanel
         {
             Orientation = Orientation.Horizontal,
-            Margin = new Thickness(level * 20, 1, 0, 1) // 每个层级增加缩进
+            Margin = new Thickness(level * 20, 1, 0, 1) 
         };
 
         var fileIcon = GetFileIcon(file);
@@ -143,7 +143,7 @@ public partial class UploadExperimentWindow : Window
         var fileTextBlock = new TextBlock
         {
             Text = file.Name,
-            FontFamily = new FontFamily("YourFontFamily"),
+            // FontFamily = new FontFamily("YourFontFamily"),
             FontSize = 15,
             TextWrapping = TextWrapping.Wrap
         };
@@ -248,11 +248,6 @@ public partial class UploadExperimentWindow : Window
         Buttons();
     }
 
-
-    public void GetVideo()
-    {
-    }
-
     private void Buttons()
     {
         // 获取按钮引用
@@ -271,9 +266,35 @@ public partial class UploadExperimentWindow : Window
     private void OnSubmitButtonClick(object sender, RoutedEventArgs e)
     {
         AppWindowManager.ExperimentWindow.Submit();
+
+        AppWindowManager.ToggleWindow(ref AppWindowManager.UploadExperimentMessageWindow, () => new UploadExperimentMessageWindow(), false);
+
+        Point p = GetScreenCenter();
+
+        AppWindowManager.UploadExperimentMessageWindow.Position = new PixelPoint((int)p.X - 226, (int)(p.Y - p.Y / 2));
+
         AppWindowManager.CloseWindow(ref AppWindowManager.UploadExperimentWindow);
     }
 
+    public Point GetScreenCenter()
+    {
+        var screens = Screens.All;
+        if (screens.Count > 0)
+        {
+            // 获取主屏幕的尺寸
+            var primaryScreen = screens[0];
+            double screenWidth = primaryScreen.Bounds.Width;
+            double screenHeight = primaryScreen.Bounds.Height;
+
+            double centerX = screenWidth / 2;
+            double centerY = screenHeight / 2;
+
+            return new Point(centerX, centerY);
+        }
+
+        // 如果没有找到屏幕，返回 (0, 0)
+        return new Point(0, 0);
+    }
 
     public bool LoadLatestMp4File(TextBlock textBlock)
     {
@@ -298,9 +319,36 @@ public partial class UploadExperimentWindow : Window
         // 如果找到文件，则更新 TextBlock 的文本
         if (latestFile != null)
         {
-            var creationTime = latestFile.CreationTime.ToString("yyyyMMddHHmm");
+            var creationTime = latestFile.CreationTime.ToString("HH:mm");
             var fileName = Path.GetFileNameWithoutExtension(latestFile.Name); // 获取文件名（不带扩展名）
-            textBlock.Text = $"{creationTime} {fileName}"; // 设置 TextBlock 的文本
+
+            // 如果文件名超过 20 个字符，进行截断
+            if (fileName.Length > 40)
+            {
+                fileName = fileName.Substring(0, 40) + "..."; // 截取前 20 个字符并添加省略号
+            }
+
+            textBlock.Text = $" {fileName}    {creationTime}"; // 设置 TextBlock 的文本
+
+            // 计算并设置 TextBlock 的宽度
+            double maxWidth = 370; // 根据需要设定的最大宽度
+            textBlock.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            if (textBlock.DesiredSize.Width > maxWidth)
+            {
+                textBlock.Width = maxWidth; // 设置宽度以适应
+            }
+            else
+            {
+                textBlock.Width = textBlock.DesiredSize.Width; // 设置为实际宽度
+            }
+
+            // 设置 TextWrapping 为 Wrap 以自动换行
+            textBlock.TextWrapping = TextWrapping.Wrap;
+
+            // 计算并更新 Canvas.Left 的值
+            double defaultLeft = 500; // 默认左边距
+            double adjustedLeft = defaultLeft - (textBlock.DesiredSize.Width - 1); // 根据内容宽度调整 left 值
+            Canvas.SetLeft(textBlock, Math.Max(adjustedLeft, 0)); // 确保不小于 0
         }
         else
         {
@@ -311,6 +359,7 @@ public partial class UploadExperimentWindow : Window
         return true;
     }
 
+
     private void CancelButton_OnClick(object? sender, RoutedEventArgs e)
     {
         AppWindowManager.CloseWindow(ref AppWindowManager.UploadExperimentWindow);

ToolsForm/ToolsForm/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache

@@ -1 +1 @@
-4f8bc25ec09d514703db0be08bb36ccf0ef7bede5211af7fae4def96df36fcac
+5479303a6418e30b605a4107a549349c374423315bbff523b59ebdd51fcc4c78

ToolsForm/ToolsForm/obj/Debug/net8.0/ToolsForm.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ToolsForm")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+704ebc12d8f15de82f0f089ec9fc95d70a4a97ed")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0698dce205e4a109d2ff15ef97eae71bd9fff225")]
 [assembly: System.Reflection.AssemblyProductAttribute("ToolsForm")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ToolsForm")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

ToolsForm/ToolsForm/obj/Debug/net8.0/ToolsForm.AssemblyInfoInputs.cache

@@ -1 +1 @@
-6b847eeaec54d2b71165b694438a55a79155fb71730be52ae068654d1fdd135b
+eca466b9201f5b5247773811670bbfa7b937a465bb127f8b014c605527d25043

ToolsForm/ToolsForm/obj/Debug/net8.0/ToolsForm.GeneratedMSBuildEditorConfig.editorconfig

@@ -58,5 +58,8 @@ build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 [E:/Unity Projects/GitLab/2024/ICT_ToolsForm/ToolsForm/ToolsForm/Views/TemporaryStorageWindow.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
+[E:/Unity Projects/GitLab/2024/ICT_ToolsForm/ToolsForm/ToolsForm/Views/UploadExperimentMessageWindow.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
 [E:/Unity Projects/GitLab/2024/ICT_ToolsForm/ToolsForm/ToolsForm/Views/UploadExperimentWindow.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml

ToolsForm/ToolsForm/obj/Debug/net8.0/ToolsForm.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-028dd3421fc5b8f475d55ded736640f7f3796b8355633ad596b1516e95a3a626
+053cff6f51e40f43c4a777dbb1a1a00a4f7588cc9e9b5460b95a793d1e7dc86a