From 284dcda06eb7f0e9ca0e523a287df02db1497e73 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 28 Aug 2023 19:45:46 +0800 Subject: [PATCH] chore: add log for #6006 --- src/MaaCore/AsstCaller.cpp | 1 + src/MaaWpfGui/Main/AsstProxy.cs | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MaaCore/AsstCaller.cpp b/src/MaaCore/AsstCaller.cpp index 21d83765ec..cb78169fec 100644 --- a/src/MaaCore/AsstCaller.cpp +++ b/src/MaaCore/AsstCaller.cpp @@ -111,6 +111,7 @@ AsstBool AsstSetInstanceOption(AsstHandle handle, AsstInstanceOptionKey key, con AsstBool AsstConnect(AsstHandle handle, const char* adb_path, const char* address, const char* config) { if (!inited() || handle == nullptr) { + asst::Log.error(__FUNCTION__, "Cannot connect to device, asst not inited or handle is nullptr", inited(), handle); return AsstFalse; } diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 3b6a9d8388..9882abc9c6 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -28,6 +28,7 @@ using MaaWpfGui.States; using MaaWpfGui.ViewModels.UI; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Serilog; using Stylet; namespace MaaWpfGui.Main @@ -49,6 +50,7 @@ namespace MaaWpfGui.Main public class AsstProxy { private readonly RunningState runningState; + private static readonly ILogger _logger = Log.ForContext(); private delegate void CallbackDelegate(int msg, IntPtr json_buffer, IntPtr custom_arg); @@ -106,11 +108,15 @@ namespace MaaWpfGui.Main private static unsafe bool AsstConnect(AsstHandle handle, string adb_path, string address, string config) { + _logger.Information(((int)handle).ToString(), adb_path, address, config); + fixed (byte* ptr1 = EncodeNullTerminatedUTF8(adb_path), ptr2 = EncodeNullTerminatedUTF8(address), ptr3 = EncodeNullTerminatedUTF8(config)) { - return AsstConnect(handle, ptr1, ptr2, ptr3); + bool ret = AsstConnect(handle, ptr1, ptr2, ptr3); + _logger.Information(((int)handle).ToString(), adb_path, address, config, "return", ret); + return ret; } }