update issue #4 , and ver 1.3

teranum · Sep 7, 2024 · 8778270 · 8778270
1 parent 7e32596
commit 8778270
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@
 | -------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Development tool, language**          |VisualStudio2022, C# |
 | **UI Design**          |WPF, MVVM |
-| **KOAStudio.Core**<br />KOAStudio MVVM core Library          |[![NETFramework48](https://img.shields.io/badge/.NET%20Framework-4.8-brightgreen)](https://github.com/terapark/KOAStudio/blob/master/src/KOAStudio.Core/KOAStudio.Core.csproj) |
-| **KOAStudio**<br />국내OpenApi Main project          |[![NETFramework48](https://img.shields.io/badge/.NET%20Framework-4.8-brightgreen)](https://github.com/terapark/KOAStudio/blob/master/src/KOAStudio/KOAStudio.csproj) |
-| **WKOAStudio**<br />해외OpenApi Main project          |[![NETFramework48](https://img.shields.io/badge/.NET%20Framework-4.8-brightgreen)](https://github.com/terapark/KOAStudio/blob/master/src/WKOAStudio/WKOAStudio.csproj) |
+| **KOAStudio.Core**<br />KOAStudio MVVM core Library          |[![net8.0-windows](https://img.shields.io/badge/.NET8.0-brightgreen)](https://github.com/terapark/KOAStudio/blob/master/src/KOAStudio.Core/KOAStudio.Core.csproj) |
+| **KOAStudio**<br />국내OpenApi Main project          |[![net8.0-windows](https://img.shields.io/badge/.NET8.0-brightgreen)](https://github.com/terapark/KOAStudio/blob/master/src/KOAStudio/KOAStudio.csproj) |
+| **WKOAStudio**<br />해외OpenApi Main project          |[![net8.0-windows](https://img.shields.io/badge/.NET8.0-brightgreen)](https://github.com/terapark/KOAStudio/blob/master/src/WKOAStudio/WKOAStudio.csproj) |
 | **3rd nuget packages**          |CommunityToolkit.Mvvm<br />Microsoft.Extensions.DependencyInjection<br />Microsoft.Xaml.Behaviors.Wpf<br />AvalonEdit<br />KHOpenApi.NET |
 
 ## 📷 Screenshots

diff --git a/src/KOAStudio.Core/KOAStudio.Core.csproj b/src/KOAStudio.Core/KOAStudio.Core.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="*" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="*" />
 		<PackageReference Include="AvalonEdit" Version="*" />
-		<PackageReference Include="KHOpenApi.NET" Version="*" />
+		<PackageReference Include="KHOpenApi.NET" Version="1.5.4" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
 	</ItemGroup>
 

diff --git a/src/KOAStudio/Business/BusinessLogic.ApiEvents.cs b/src/KOAStudio/Business/BusinessLogic.ApiEvents.cs
@@ -244,7 +244,7 @@ private void AxKHOpenApi_OnReceiveRealData(object sender, _DKHOpenAPIEvents_OnRe
 
     private void AxKHOpenApi_OnReceiveRealCondition(object sender, _DKHOpenAPIEvents_OnReceiveRealConditionEvent e)
     {
-        OutputLog((int)TAB_LIST_KIND.조건검색실시간, $"sTrCode = {e.sTrCode}, strType = {e.strType}, strConditionName = {e.strConditionName}, strConditionIndex = {e.strConditionIndex}");
+        OutputLog((int)TAB_LIST_KIND.조건검색실시간, $"strCode = {e.strCode}, strType = {e.strType}, strConditionName = {e.strConditionName}, strConditionIndex = {e.strConditionIndex}");
     }
 
     private void AxKHOpenApi_OnReceiveMsg(object sender, _DKHOpenAPIEvents_OnReceiveMsgEvent e)

diff --git a/src/KOAStudio/Business/BusinessLogic.cs b/src/KOAStudio/Business/BusinessLogic.cs
@@ -638,13 +638,14 @@ private async void Load_화면목록Async()
                                         ScrnSpecial.ScreenName = KeyAndValue.Value;
                                         break;
                                     case "TRCount":
-                                        ScrnSpecial.TRs = new string[Convert.ToInt32(KeyAndValue.Value)];
+                                        _ = int.TryParse(KeyAndValue.Value, out int nTRCount);
+                                        ScrnSpecial.TRs = new string[nTRCount];
                                         break;
                                     default:
                                         {
                                             if (KeyAndValue.Key.Contains("TR_"))
                                             {
-                                                int nIndex = Convert.ToInt32(KeyAndValue.Key[3..]);
+                                                _ = int.TryParse(KeyAndValue.Key[3..], out int nIndex);
                                                 if (ScrnSpecial.TRs != null && nIndex >= 0 && nIndex < ScrnSpecial.TRs.Length)
                                                     ScrnSpecial.TRs[nIndex] = KeyAndValue.Value;
                                             }

diff --git a/src/KOAStudio/KOAStudio.csproj b/src/KOAStudio/KOAStudio.csproj
@@ -10,7 +10,7 @@
 		<ApplicationIcon>app.ico</ApplicationIcon>
 		<BaseOutputPath>$(SolutionDir)bin\</BaseOutputPath>
 		<Platforms>x86;x64</Platforms>
-		<Version>1.2</Version>
+		<Version>1.3</Version>
 		<PreserveCompilationContext>false</PreserveCompilationContext>
 		<NoWarn>$(NoWarn);MA0048</NoWarn>
 	</PropertyGroup>

diff --git a/src/WKOAStudio/Business/BusinessLogic.ApiEvents.cs b/src/WKOAStudio/Business/BusinessLogic.ApiEvents.cs
@@ -1,4 +1,4 @@
-using KFOpenApi.NET;
+using KHOpenApi.NET;
 using KOAStudio.Core.Models;
 using KOAStudio.Core.ViewModels;
 using System.Diagnostics;

diff --git a/src/WKOAStudio/Business/BusinessLogic.cs b/src/WKOAStudio/Business/BusinessLogic.cs
@@ -1,4 +1,4 @@
-using KFOpenApi.NET;
+using KHOpenApi.NET;
 using KOAStudio.Core.Helpers;
 using KOAStudio.Core.Models;
 using KOAStudio.Core.Services;

diff --git a/src/WKOAStudio/WKOAStudio.csproj b/src/WKOAStudio/WKOAStudio.csproj
@@ -10,7 +10,7 @@
 		<ApplicationIcon>app.ico</ApplicationIcon>
 		<BaseOutputPath>$(SolutionDir)bin\</BaseOutputPath>
 		<Platforms>x86;x64</Platforms>
-		<Version>1.2</Version>
+		<Version>1.3</Version>
 		<PreserveCompilationContext>false</PreserveCompilationContext>
 		<NoWarn>$(NoWarn);MA0048</NoWarn>
 	</PropertyGroup>