diff --git a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs index 8025e2d..7a416c7 100644 --- a/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs +++ b/WelsonJS.Toolkit/WelsonJS.Service/ServiceMain.cs @@ -114,7 +114,7 @@ namespace WelsonJS.Service Timer screenTimer = new Timer { - Interval = 1000 // 1 second + Interval = 10000 // 10 seconds }; screenTimer.Elapsed += OnScreenTime; timers.Add(screenTimer); @@ -224,10 +224,9 @@ namespace WelsonJS.Service Log(result.ScreenNumber.ToString()); Log(result.Location.ToString()); - Log(DispatchServiceEvent("screenTime", new object[] + Log(DispatchServiceEvent("screenTime", new string[] { result.FileName, - result.ScreenNumber.ToString(), result.Location.X.ToString(), result.Location.Y.ToString(), result.MaxCorrelation.ToString() @@ -240,9 +239,17 @@ namespace WelsonJS.Service } } - private string DispatchServiceEvent(string eventType, object[] args = null) + private string DispatchServiceEvent(string eventType, string[] args = null) { - return InvokeScriptMethod("dispatchServiceEvent", scriptName, eventType, args); + if (args == null) + { + return InvokeScriptMethod("dispatchServiceEvent", scriptName, eventType, ""); + } + else + { + return InvokeScriptMethod("dispatchServiceEvent", scriptName, eventType, String.Join("; ", args)); + } + } private string InvokeScriptMethod(string methodName, params object[] parameters) diff --git a/app.js b/app.js index 1ea8cba..62e7d9e 100644 --- a/app.js +++ b/app.js @@ -589,8 +589,9 @@ function initializeWindow(name, args, w, h) { } } -function dispatchServiceEvent(name, eventType, args) { +function dispatchServiceEvent(name, eventType, _args) { var app = require(name); + var args = _args.split('; '); // load the service if (app) { diff --git a/bin/x86/WelsonJS.Service.exe b/bin/x86/WelsonJS.Service.exe index a13ef62..8c1b465 100644 Binary files a/bin/x86/WelsonJS.Service.exe and b/bin/x86/WelsonJS.Service.exe differ diff --git a/bin/x86/WelsonJS.Service.pdb b/bin/x86/WelsonJS.Service.pdb index 866c3b9..f7d4d11 100644 Binary files a/bin/x86/WelsonJS.Service.pdb and b/bin/x86/WelsonJS.Service.pdb differ diff --git a/defaultService.js b/defaultService.js index 85519ba..8347b48 100644 --- a/defaultService.js +++ b/defaultService.js @@ -14,8 +14,8 @@ function onServiceElapsedTime() { return "onServiceElapsedTime recevied"; } -function onServiceScreenTime(filename, handle, title, x, y, maxCorrelation) { - return "onServiceScreenTime recevied. " + filename; +function onServiceScreenTime(args) { + return "onServiceScreenTime recevied. " + args.join(', '); } exports.main = main;