소스정리

Cs_HMI/AGVLogic/AGVNavigationCore/AGVNavigationCore.csproj

@@ -48,6 +48,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -58,9 +61,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\AGVState.cs" />

Cs_HMI/AGVLogic/AGVNavigationCore/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
 </packages>

Cs_HMI/Project/AGV4.csproj

@@ -42,7 +42,7 @@
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <OutputPath>..\..\..\..\..\Amkor\AGV4\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NOSPEECH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -116,8 +116,7 @@
       <HintPath>C:\Program Files (x86)\Microsoft SDKs\Speech\v11.0\Assembly\Microsoft.Speech.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -187,7 +186,9 @@
     <Compile Include="Device\BMS.cs" />
     <Compile Include="Device\BMSInformationEventArgs.cs" />
     <Compile Include="Device\CFlag.cs" />
-    <Compile Include="Device\xbee.cs" />
+    <Compile Include="Device\xbee.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Device\Socket.cs" />
     <Compile Include="Dialog\fCounter.cs">
       <SubType>Form</SubType>

Cs_HMI/Project/PUB.cs

@@ -8,7 +8,11 @@ using System.Media;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using System;
+
+#if SPEECH
 using Microsoft.Speech.Synthesis;
+#endif
+
 using System.Threading.Tasks;
 using System.Data.SqlClient;
 using System.Linq;
@@ -69,8 +73,9 @@ namespace Project
         /// 디버그모니터용 소켓(데이터를 전송만 한다)
         /// </summary>
         public static Device.Socket sock_debug;
-
+#if SPEECH
         private static SpeechSynthesizer voice;
+#endif
         public static SoundPlayer mplayer;
 
         [DllImport("winmm.dll")]
@@ -108,6 +113,7 @@ namespace Project
                 Console.WriteLine("speech disabled");
                 return;
             }
+#if SPEECH
             if (force)
                 voice.SpeakAsyncCancelAll();
             if (voice.State == SynthesizerState.Ready)
@@ -117,6 +123,9 @@ namespace Project
                 if (logcate.isEmpty()) logcate = "SPEAK";
                 PUB.log.Add(logcate, m);
             }
+#else
+            PUB.log.Add($"스피치컴파일상수OFF");
+#endif
         }
 
         /// <summary>
@@ -228,7 +237,7 @@ namespace Project
                     PUB.mplayer.SoundLocation = PUB.setting.musicfile;
                     SetVolume(PUB.setting.musicvol);
                 }
-
+#if SPEECH
             voice = new SpeechSynthesizer();
             try
             {
@@ -256,7 +265,7 @@ namespace Project
                 // 음성 설정 실패 시 기본값 사용
             }
             voice.SetOutputToDefaultAudioDevice();
-
+#endif
             var file_version = System.IO.Path.Combine(UTIL.CurrentPath, "version.txt");
             if (System.IO.File.Exists(file_version))
             {

Cs_HMI/Project/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net48" />
   <package id="System.Memory" version="4.5.4" targetFramework="net48" />