From 36e0cc0b1297ac14c869dbc81740eb999f61590d Mon Sep 17 00:00:00 2001 From: Stone Li Date: Wed, 22 Mar 2023 08:38:44 +0800 Subject: [PATCH] ENH: optimize track logic Change-Id: I1fea7eb9681389924c32f3754fc77ee21a3ab898 Signed-off-by: Stone Li --- src/slic3r/GUI/GUI_App.cpp | 1 + src/slic3r/Utils/NetworkAgent.cpp | 4 ++++ src/slic3r/Utils/NetworkAgent.hpp | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 6728e3ddca..312d73e25c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3954,6 +3954,7 @@ void GUI_App::check_track_enable() wxString os_desc = wxGetOsDescription(); int major = 0, minor = 0, micro = 0; header_json["os"] = std::string(os_desc.ToUTF8()); + header_json["name"] = std::string(SLIC3R_APP_NAME); if (m_agent) { m_agent->track_header(header_json.dump()); m_agent->track_enable(true); diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp index 498c081db9..2f4323bbfa 100644 --- a/src/slic3r/Utils/NetworkAgent.cpp +++ b/src/slic3r/Utils/NetworkAgent.cpp @@ -1144,6 +1144,7 @@ int NetworkAgent::get_my_profile(std::string token, unsigned int *http_code, std int NetworkAgent::track_enable(bool enable) { + enable_track = enable; int ret = 0; if (network_agent && track_enable_ptr) { ret = track_enable_ptr(network_agent, enable); @@ -1155,6 +1156,9 @@ int NetworkAgent::track_enable(bool enable) int NetworkAgent::track_event(std::string evt_key, std::string content) { + if (!this->enable_track) + return 0; + int ret = 0; if (network_agent && track_event_ptr) { ret = track_event_ptr(network_agent, evt_key, content); diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp index 03020c7451..cf1cea3a2a 100644 --- a/src/slic3r/Utils/NetworkAgent.hpp +++ b/src/slic3r/Utils/NetworkAgent.hpp @@ -170,9 +170,8 @@ public: int track_event(std::string evt_key, std::string content); int track_header(std::string header); int track_update_property(std::string name, std::string value, std::string type = "string"); - private: - + bool enable_track = false; void* network_agent { nullptr }; static func_check_debug_consistent check_debug_consistent_ptr;