From 4a33238d7e293e7302afe2138b3c80c0784a713a Mon Sep 17 00:00:00 2001 From: "Namhyeon, Go" Date: Fri, 26 Jul 2024 17:24:56 +0900 Subject: [PATCH] Change the target framework version to 4.8, and renaming some functions --- WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs | 12 +++++++++--- .../WelsonJS.Service/WelsonJS.Service.csproj | 2 +- WelsonJS.Toolkit/WelsonJS.Service/app.config | 2 +- app.js | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs index 9fd653c..90ab6c0 100644 --- a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs +++ b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs @@ -117,7 +117,7 @@ namespace WelsonJS.Service scriptControl.AddCode(scriptText); // initialize - Log(InvokeScriptMethod("initializeService", scriptName, "start")); + Log(DispatchServiceEvent(scriptName, "start")); } catch (Exception ex) { @@ -144,7 +144,7 @@ namespace WelsonJS.Service try { - Log(InvokeScriptMethod("initializeService", scriptName, "stop")); + Log(DispatchServiceEvent(scriptName, "stop")); if (scriptControl != null) { scriptControl.Reset(); @@ -163,7 +163,7 @@ namespace WelsonJS.Service { try { - Log(InvokeScriptMethod("initializeService", scriptName, "elapsedTime")); + Log(DispatchServiceEvent(scriptName, "elapsedTime")); } catch (Exception ex) { @@ -171,6 +171,11 @@ namespace WelsonJS.Service } } + private string DispatchServiceEvent(string name, string eventType) + { + return InvokeScriptMethod("dispatchServiceEvent", name, eventType); + } + private string InvokeScriptMethod(string methodName, params object[] parameters) { if (scriptControl != null) @@ -185,6 +190,7 @@ namespace WelsonJS.Service return "void"; } + private void Log(string message) { using (StreamWriter writer = new StreamWriter(logFilePath, true)) diff --git a/WelsonJS.Toolkit/WelsonJS.Service/WelsonJS.Service.csproj b/WelsonJS.Toolkit/WelsonJS.Service/WelsonJS.Service.csproj index d58158f..01e647d 100644 --- a/WelsonJS.Toolkit/WelsonJS.Service/WelsonJS.Service.csproj +++ b/WelsonJS.Toolkit/WelsonJS.Service/WelsonJS.Service.csproj @@ -8,7 +8,7 @@ WinExe WelsonJS.Service WelsonJS.Service - v4.0 + v4.8 512 true diff --git a/WelsonJS.Toolkit/WelsonJS.Service/app.config b/WelsonJS.Toolkit/WelsonJS.Service/app.config index fcd0c93..3e0e37c 100644 --- a/WelsonJS.Toolkit/WelsonJS.Service/app.config +++ b/WelsonJS.Toolkit/WelsonJS.Service/app.config @@ -1,3 +1,3 @@ - + diff --git a/app.js b/app.js index 3313ef3..c943b2a 100644 --- a/app.js +++ b/app.js @@ -589,7 +589,7 @@ function initializeWindow(name, args, w, h) { } } -function initializeService(name, eventType) { +function dispatchServiceEvent(name, eventType) { var app = require(name); // load the service