提交

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

@@ -8,26 +8,12 @@
   </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/UploadExperiment/代码框.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/加载.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/取消.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/完成.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/提交实验框.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/检测中.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/视频.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Assets/img/UploadExperiment/视频框.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml.cs" 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/Models/IdeModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Models/IdeModel.cs" afterDir="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/IDEWindow2.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/IDEWindow2.axaml.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/Models/ToolsEventModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Models/ToolsEventModel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ToolsForm/Views/OverviewWindow.axaml" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/OverviewWindow.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/UploadExperimentWindow.axaml" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml" 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/Views/UploadExperimentWindow.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/UploadExperimentWindow.axaml.cs" 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/MainWindow.axaml.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/Views/MainWindow.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" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/ToolsForm.exe" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/ToolsForm.exe" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/ToolsForm.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/bin/Debug/net8.0/ToolsForm.pdb" afterDir="false" />
@@ -37,23 +23,12 @@
       <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.assets.cache" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.assets.cache" 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.csproj.FileListAbsolute.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.csproj.FileListAbsolute.txt" 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.genruntimeconfig.cache" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ToolsForm.genruntimeconfig.cache" 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" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ref/ToolsForm.dll" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/ref/ToolsForm.dll" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/refint/Avalonia/ToolsForm.dll" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/refint/Avalonia/ToolsForm.dll" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/refint/ToolsForm.dll" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/Debug/net8.0/refint/ToolsForm.dll" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/ToolsForm.csproj.nuget.dgspec.json" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/ToolsForm.csproj.nuget.dgspec.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/project.assets.json" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/project.assets.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/project.nuget.cache" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/project.nuget.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/project.packagespec.json" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/project.packagespec.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/rider.project.model.nuget.info" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/rider.project.model.nuget.info" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ToolsForm/obj/rider.project.restore.info" beforeDir="false" afterPath="$PROJECT_DIR$/ToolsForm/obj/rider.project.restore.info" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -168,7 +143,7 @@
       <workItem from="1729819752329" duration="7261000" />
       <workItem from="1729835370931" duration="39273000" />
       <workItem from="1730253804607" duration="6537000" />
-      <workItem from="1730270228361" duration="14340000" />
+      <workItem from="1730270228361" duration="23639000" />
     </task>
     <servers />
   </component>
@@ -176,6 +151,17 @@
     <option name="version" value="3" />
   </component>
   <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />

ToolsForm/ToolsForm/Models/IdeModel.cs

@@ -32,7 +32,14 @@ namespace ToolsForm.Models
         // IDE 的路径
         private string _idePath;
         
-        
+        private string _folderPath;
+
+        public string FolderPath
+        {
+            get => _folderPath;
+            set => _folderPath = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
         [JsonConverter(typeof(IDETypeEnum))]
         // IDE 的类型（Python、Java 或 C）
         private IDETypeEnum _ideTypeEnum;

ToolsForm/ToolsForm/Views/IDEWindow2.axaml.cs

@@ -59,7 +59,7 @@ public partial class IDEWindow2 : Window
             // 将选择的文件夹路径显示在TextBlock上
             // var image = this.FindControl<TextBlock>("FolderPathTextBlock");
             // image.Text = result;
-            
+            AppDataManager.IdeModel.FolderPath = result;
             Console.WriteLine(result);
             
         }

ToolsForm/ToolsForm/Views/OverviewWindow.axaml

@@ -112,7 +112,6 @@
                         ClipToBounds="False"
                         FontFamily="{StaticResource SourceLight}"
                         FontSize="15"
-                        Text="（1）创建ROS节点，用于订阅相机图像话题123"
                         TextWrapping="Wrap" />
                 </StackPanel>
             </ScrollViewer>

ToolsForm/ToolsForm/Views/UploadExperimentWindow.axaml

@@ -119,7 +119,7 @@
             Canvas.Top="196"
             FontFamily="{StaticResource SourceNormal}"
             FontSize="15"
-            Text="提交实验" />
+            Text="代码文件" />
 
 
         <Button
@@ -147,6 +147,23 @@
             <Image Source="../Assets/img/UploadExperiment/检测中.png" />
         </Button>
 
+        <Border
+            Background="#c8c6c3"
+            Canvas.Left="76"
+            Canvas.Top="225"
+            Height="170"
+            Width="443">
+            <ScrollViewer>
+                <StackPanel x:Name="StackPanelWord">
+                    <TextBlock
+                        ClipToBounds="False"
+                        FontFamily="{StaticResource SourceLight}"
+                        FontSize="15"
+                        Text="123123"
+                        TextWrapping="Wrap" />
+                </StackPanel>
+            </ScrollViewer>
+        </Border>
 
         <!--    -->
         <!--  <Image  -->

ToolsForm/ToolsForm/Views/UploadExperimentWindow.axaml.cs

@@ -1,14 +1,27 @@
 using System;
+using System.Collections.ObjectModel;
+using System.IO;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using Avalonia.Threading;
+using ToolsForm.Models;
 
 namespace ToolsForm.Views;
 
+public class FileSystemItem
+{
+    public string Name { get; set; }
+    public bool IsDirectory { get; set; }
+    public ObservableCollection<FileSystemItem> Children { get; set; } = new ObservableCollection<FileSystemItem>();
+}
+
 public partial class UploadExperimentWindow : Window
 {
     private DispatcherTimer _rotationTimer1;
@@ -16,10 +29,15 @@ public partial class UploadExperimentWindow : Window
     private double _rotationAngle1 = 0;
     private double _rotationAngle2 = 0;
 
+    public ObservableCollection<FileSystemItem> FileItems { get; set; } = new ObservableCollection<FileSystemItem>();
+
+
     public UploadExperimentWindow()
     {
         InitializeComponent();
 
+        DataContext = this; // 绑定数据上下文
+
         // 初始化旋转定时器
         _rotationTimer1 = new DispatcherTimer
         {
@@ -35,8 +53,129 @@ public partial class UploadExperimentWindow : Window
 
         // 开始旋转
         StartLoadingAnimation();
+
+
+        CompleteLoading();
     }
 
+
+    public void LoadDirectoryContents(string path, StackPanel container)
+    {
+        // 检查文件夹是否存在
+        if (!Directory.Exists(path))
+            throw new DirectoryNotFoundException("指定的文件夹未找到");
+
+        // 清空容器
+        container.Children.Clear();
+
+        // 获取目录信息
+        var dirInfo = new DirectoryInfo(path);
+
+        // 加载目录和文件
+        LoadContentsRecursively(dirInfo, container, 0);
+    }
+
+    private void LoadContentsRecursively(DirectoryInfo dirInfo, StackPanel container, int level)
+    {
+        // 遍历所有子目录
+        foreach (var dir in dirInfo.GetDirectories())
+        {
+            AddDirectoryToContainer(dir, container, level);
+
+            // 递归加载子目录内容
+            LoadContentsRecursively(dir, container, level + 1);
+        }
+
+        // 遍历所有文件
+        foreach (var file in dirInfo.GetFiles())
+        {
+            AddFileToContainer(file, container, level);
+        }
+    }
+
+    private void AddDirectoryToContainer(DirectoryInfo dir, StackPanel container, int level)
+    {
+        var itemPanel = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Margin = new Thickness(level * 20, 1, 0, 1) // 每个层级增加缩进
+        };
+
+        var dirIcon = new Image
+        {
+            Source = new Bitmap(AssetLoader.Open(new Uri("avares://ToolsForm/Assets/img/UploadExperiment/文件夹.png"))), 
+            Width = 16,
+            Height = 16,
+            Margin = new Thickness(0, 0, 5, 0)
+        };
+        itemPanel.Children.Add(dirIcon);
+
+        var dirTextBlock = new TextBlock
+        {
+            Text = $"{dir.Name} ({dir.FullName})", // 添加完整路径
+            FontFamily = new FontFamily("YourFontFamily"),
+            FontSize = 15,
+            TextWrapping = TextWrapping.Wrap
+        };
+        itemPanel.Children.Add(dirTextBlock);
+
+        container.Children.Add(itemPanel);
+    }
+
+    private void AddFileToContainer(FileInfo file, StackPanel container, int level)
+    {
+        var itemPanel = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Margin = new Thickness(level * 20, 1, 0, 1) // 每个层级增加缩进
+        };
+
+        var fileIcon = GetFileIcon(file);
+        itemPanel.Children.Add(fileIcon);
+
+        var fileTextBlock = new TextBlock
+        {
+            Text = file.Name,
+            FontFamily = new FontFamily("YourFontFamily"),
+            FontSize = 15,
+            TextWrapping = TextWrapping.Wrap
+        };
+        itemPanel.Children.Add(fileTextBlock);
+
+        container.Children.Add(itemPanel);
+    }
+
+    private Image GetFileIcon(FileInfo file)
+    {
+        string iconPath;
+
+        // 根据文件扩展名选择图标
+        switch (file.Extension.ToLower())
+        {
+            case ".py":
+                iconPath = "avares://ToolsForm/Assets/img/UploadExperiment/python.png"; 
+                break;
+            case ".java":
+                iconPath = "avares://ToolsForm/Assets/img/UploadExperiment/java.png"; 
+                break;
+            case ".c":
+                iconPath = "avares://ToolsForm/Assets/img/UploadExperiment/c.png"; 
+                break;
+            default:
+                iconPath = "avares://ToolsForm/Assets/img/UploadExperiment/其他文件.png"; 
+                break;
+        }
+
+        return new Image
+        {
+            Source = new Bitmap(AssetLoader.Open(new Uri(iconPath))),
+            Width = 16,
+            Height = 16,
+            Margin = new Thickness(0, 0, 5, 0)
+        };
+    }
+
+
     private void StartLoadingAnimation()
     {
         LoadingImage1.IsVisible = true;
@@ -64,11 +203,16 @@ public partial class UploadExperimentWindow : Window
     }
 
     // 模拟加载完成的方法
-    private void CompleteLoading()
+    private async void CompleteLoading()
     {
+        await Task.Delay(2000);
         // 停止旋转
         _rotationTimer1.Stop();
+        await Task.Delay(2000);
         _rotationTimer2.Stop();
+         LoadDirectoryContents("E:\\Eclipse Workspace\\Upa_Java", StackPanelWord);
+        //LoadDirectoryContents(AppDataManager.IdeModel.FolderPath, StackPanelWord);
+
         LoadingImage1.IsVisible = false;
         LoadingImage2.IsVisible = false;
         CheckMarkImage1.IsVisible = true;
@@ -77,6 +221,6 @@ public partial class UploadExperimentWindow : Window
 
     private void OnSubmitButtonClick(object sender, RoutedEventArgs e)
     {
-        CompleteLoading(); // 调用加载完成的方法
+        // 调用加载完成的方法
     }
 }

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

@@ -1 +1 @@
-7e24e741ea2dd0806d7e3440db4d3901c6e672b65047dc68b6addf1ebaa3ebc0
+e76f595a14d7ab41574f9eac585b1a80a32339df1611162aada8377a10d2bcdd

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+0534e0b178b01e0ae22201599fa1dee00685cee8")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e3d4f719bf17b0d5405927cb05d18368d2f72acb")]
 [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 @@
-0828ee78dd11a8725fca90aed806976a3445666c03da9a1f42634be9898a8ebd
+a834706ef20a0cc167aa5e69c7811af9b6b9b9b9c52dff7029ce0449d696aa14