From c609d1e59f0e9aa528eb911d049c9ce4934d93b2 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Tue, 15 Aug 2023 08:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E4=BB=B6rstray=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=87=8F=E5=B0=91=E5=AF=B9UI=E5=B1=82=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.Controls/Rs.Controls.csproj     |  4 ++++
 Rs.Controls/RsTray.cs              |  9 +++++----
 Rs.MotionPlat/Rs.MotionPlat.csproj | 12 +++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Rs.Controls/Rs.Controls.csproj b/Rs.Controls/Rs.Controls.csproj
index 9467f75..bd79e0b 100644
--- a/Rs.Controls/Rs.Controls.csproj
+++ b/Rs.Controls/Rs.Controls.csproj
@@ -38,6 +38,10 @@
     <Reference Include="HWindow_Tool">
       <HintPath>C:\Users\Administrator\Desktop\1\bin\Debug\HWindow_Tool.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Users\Administrator\Desktop\新建文件夹 (3)\Rs.MotionPlat\Rs.Framework\bin\Debug\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
diff --git a/Rs.Controls/RsTray.cs b/Rs.Controls/RsTray.cs
index 6367e6e..6074de9 100644
--- a/Rs.Controls/RsTray.cs
+++ b/Rs.Controls/RsTray.cs
@@ -32,6 +32,7 @@ namespace Rs.Controls
 
     public partial class RsTray : UserControl
     {
+        public string RecipeName { get; set; } = "default";
         private int CurrentSlot { get; set; } = 1;
 
         private TrayInfo trayInfo;
@@ -255,7 +256,7 @@ namespace Rs.Controls
        public void Init()
         {
             trayInfo = new TrayInfo(SortDir, RowNum, ColumnNum, ItemName);
-            trayInfo = trayInfo.Init();
+            trayInfo = trayInfo.Init(RecipeName);
         }
 
         public bool Save()
@@ -703,7 +704,7 @@ namespace Rs.Controls
                         }
                     }
                 }
-                string dirPath = Path.Combine(GlobalVar.Instance.RecipeDir, ItemName);
+                string dirPath = Path.Combine(rsTray.RecipeName, ItemName);
                 if (!Directory.Exists(dirPath))
                 {
                     Directory.CreateDirectory(dirPath);
@@ -718,9 +719,9 @@ namespace Rs.Controls
         }
 
 
-        public TrayInfo Init()
+        public TrayInfo Init(string recipeName)
         {
-            string dirPath = Path.Combine(GlobalVar.Instance.RecipeDir, ItemName);
+            string dirPath = Path.Combine(recipeName, ItemName);
             if (!Directory.Exists(dirPath))
             {
                 Directory.CreateDirectory(dirPath);
diff --git a/Rs.MotionPlat/Rs.MotionPlat.csproj b/Rs.MotionPlat/Rs.MotionPlat.csproj
index 27c6747..4d271d9 100644
--- a/Rs.MotionPlat/Rs.MotionPlat.csproj
+++ b/Rs.MotionPlat/Rs.MotionPlat.csproj
@@ -89,7 +89,9 @@
     <Compile Include="Commom\GlobalTray.cs" />
     <Compile Include="Commom\GlobalUser.cs" />
     <Compile Include="Commom\GlobalVar.cs" />
+    <Compile Include="Commom\IoEntitys.cs" />
     <Compile Include="Commom\NozzleCollection.cs" />
+    <Compile Include="Commom\Ops.cs" />
     <Compile Include="Commom\Scheduling.cs" />
     <Compile Include="Commom\VacManager.cs" />
     <Compile Include="Commom\VisionProcess.cs" />
@@ -138,11 +140,11 @@
     <Compile Include="FormMain.Designer.cs">
       <DependentUpon>FormMain.cs</DependentUpon>
     </Compile>
-    <Compile Include="Home2.cs">
+    <Compile Include="Home.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Home2.Designer.cs">
-      <DependentUpon>Home2.cs</DependentUpon>
+    <Compile Include="Home.Designer.cs">
+      <DependentUpon>Home.cs</DependentUpon>
     </Compile>
     <Compile Include="MonitorConfig.cs">
       <SubType>Form</SubType>
@@ -251,8 +253,8 @@
     <EmbeddedResource Include="FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Home2.resx">
-      <DependentUpon>Home2.cs</DependentUpon>
+    <EmbeddedResource Include="Home.resx">
+      <DependentUpon>Home.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="MonitorConfig.resx">
       <DependentUpon>MonitorConfig.cs</DependentUpon>