From 877827034708dcf1320bcd6a908d3dda2a4ef5f0 Mon Sep 17 00:00:00 2001 From: teranum Date: Sat, 7 Sep 2024 09:59:24 +0900 Subject: [PATCH] update issue #4 , and ver 1.3 --- README.md | 6 +++--- src/KOAStudio.Core/KOAStudio.Core.csproj | 2 +- src/KOAStudio/Business/BusinessLogic.ApiEvents.cs | 2 +- src/KOAStudio/Business/BusinessLogic.cs | 5 +++-- src/KOAStudio/KOAStudio.csproj | 2 +- src/WKOAStudio/Business/BusinessLogic.ApiEvents.cs | 2 +- src/WKOAStudio/Business/BusinessLogic.cs | 2 +- src/WKOAStudio/WKOAStudio.csproj | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4467d06..2bdf5ed 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ | -------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | **Development tool, language** |VisualStudio2022, C# | | **UI Design** |WPF, MVVM | -| **KOAStudio.Core**
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**
국내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**
해외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**
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**
국내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**
해외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
Microsoft.Extensions.DependencyInjection
Microsoft.Xaml.Behaviors.Wpf
AvalonEdit
KHOpenApi.NET | ## 📷 Screenshots diff --git a/src/KOAStudio.Core/KOAStudio.Core.csproj b/src/KOAStudio.Core/KOAStudio.Core.csproj index 013ec5d..2abd6c3 100644 --- a/src/KOAStudio.Core/KOAStudio.Core.csproj +++ b/src/KOAStudio.Core/KOAStudio.Core.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/KOAStudio/Business/BusinessLogic.ApiEvents.cs b/src/KOAStudio/Business/BusinessLogic.ApiEvents.cs index 62a473e..d1a2816 100644 --- 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 index 6f67ede..abb8eee 100644 --- 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 index ceede8d..60fd91c 100644 --- a/src/KOAStudio/KOAStudio.csproj +++ b/src/KOAStudio/KOAStudio.csproj @@ -10,7 +10,7 @@ app.ico $(SolutionDir)bin\ x86;x64 - 1.2 + 1.3 false $(NoWarn);MA0048 diff --git a/src/WKOAStudio/Business/BusinessLogic.ApiEvents.cs b/src/WKOAStudio/Business/BusinessLogic.ApiEvents.cs index b691c72..0d650d6 100644 --- 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 index 991f880..82a3e64 100644 --- 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 index cc8cc40..e7f1005 100644 --- a/src/WKOAStudio/WKOAStudio.csproj +++ b/src/WKOAStudio/WKOAStudio.csproj @@ -10,7 +10,7 @@ app.ico $(SolutionDir)bin\ x86;x64 - 1.2 + 1.3 false $(NoWarn);MA0048