From 59d75346ad305286f62f08ea09580ccef38da173 Mon Sep 17 00:00:00 2001
From: jinchao <383321154@qq.com>
Date: Tue, 20 May 2025 15:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E7=A7=BB=E9=99=A4=E4=BA=86Qt?=
 =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Release/include/XNCore/XNFramework.h       | 8 +-------
 Release/include/XNCore/XNScenarioManager.h | 5 ++++-
 XNCore/CMakeLists.txt                      | 8 --------
 XNCore/XNFramework.cpp                     | 4 ++--
 XNCore/XNFramework.h                       | 8 +-------
 XNCore/XNScenarioManager.cpp               | 2 +-
 XNCore/XNScenarioManager.h                 | 5 ++++-
 XNCore/XNServiceManager.cpp                | 5 -----
 8 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/Release/include/XNCore/XNFramework.h b/Release/include/XNCore/XNFramework.h
index bf31993..8dc40f6 100644
--- a/Release/include/XNCore/XNFramework.h
+++ b/Release/include/XNCore/XNFramework.h
@@ -149,12 +149,6 @@ public:
 	 */
 	void PrepareForExecute();
 
-	/**
-	 * @brief 分析场景XML
-	 * @param scenarioXml 场景XML
-	 */
-	void AnalyzeScenarioXml(const std::string &scenarioXml);
-
 	/**
 	 * @brief 仿真控制
 	 * @param objectId 对象ID
@@ -165,7 +159,7 @@ public:
 	/**
 	 * @brief 初始化
 	 */
-	void Initialize();
+	void Initialize(uint32_t initialType);
 
 	/**
 	 * @brief 仿真控制
diff --git a/Release/include/XNCore/XNScenarioManager.h b/Release/include/XNCore/XNScenarioManager.h
index 9870c3c..89a293b 100644
--- a/Release/include/XNCore/XNScenarioManager.h
+++ b/Release/include/XNCore/XNScenarioManager.h
@@ -71,6 +71,9 @@ public:
 	/**
 	 * @brief 运行环境配置文件解析
 	 * @param XmlPath:	std::string类型，运行环境配置文件解析路径
+	 * @param initialType:	uint32_t类型，初始化类型
+	 * @return true:	解析成功
+	 * @return false:	解析失败
 	 */
-	virtual bool AnalysisScenarioXml(const std::string &XmlPath);
+	virtual bool AnalysisScenarioXml(const std::string &XmlPath, uint32_t initialType);
 };
diff --git a/XNCore/CMakeLists.txt b/XNCore/CMakeLists.txt
index ff0da83..4a127fc 100755
--- a/XNCore/CMakeLists.txt
+++ b/XNCore/CMakeLists.txt
@@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.16)
 
 project(XNCore LANGUAGES CXX)
 
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -18,8 +15,6 @@ endif()
 
 file(GLOB DDS_XNIDL_SOURCES_CXX "XNIDL/*.cxx")
 
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Xml Network)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Xml Network)
 find_package(Threads REQUIRED)
 find_package(OpenSSL REQUIRED)
 
@@ -71,9 +66,6 @@ add_library(XNCore SHARED
 
 target_link_libraries(XNCore PRIVATE
 	${CMAKE_THREAD_LIBS_INIT}
-	Qt${QT_VERSION_MAJOR}::Core
-	Qt${QT_VERSION_MAJOR}::Xml
-	Qt${QT_VERSION_MAJOR}::Network
 	fastcdr
 	fastdds
 	pthread
diff --git a/XNCore/XNFramework.cpp b/XNCore/XNFramework.cpp
index df88825..0da5c8c 100755
--- a/XNCore/XNFramework.cpp
+++ b/XNCore/XNFramework.cpp
@@ -86,7 +86,7 @@ void XNFramework::SetCpuAffinity(uint32_t cpuAffinity)
 	d->uCpuAffinity = cpuAffinity;
 }
 
-void XNFramework::Initialize()
+void XNFramework::Initialize(uint32_t initialType)
 {
 	T_D();
 	LOG_INFO("XNFramework Initialize ...");
@@ -127,7 +127,7 @@ void XNFramework::Initialize()
 	}
 	LOG_INFO("XNFramework Initialize Success!");
 	LOG_INFO("XNFramework Analyze Scenario Xml ...");
-	ret = d->scenarioManager->AnalysisScenarioXml(d->scenarioXml);
+	ret = d->scenarioManager->AnalysisScenarioXml(d->scenarioXml, initialType);
 	if (!ret) {
 		LOG_ERROR("XNFramework Analyze Scenario Xml Failed!");
 		return;
diff --git a/XNCore/XNFramework.h b/XNCore/XNFramework.h
index bf31993..8dc40f6 100755
--- a/XNCore/XNFramework.h
+++ b/XNCore/XNFramework.h
@@ -149,12 +149,6 @@ public:
 	 */
 	void PrepareForExecute();
 
-	/**
-	 * @brief 分析场景XML
-	 * @param scenarioXml 场景XML
-	 */
-	void AnalyzeScenarioXml(const std::string &scenarioXml);
-
 	/**
 	 * @brief 仿真控制
 	 * @param objectId 对象ID
@@ -165,7 +159,7 @@ public:
 	/**
 	 * @brief 初始化
 	 */
-	void Initialize();
+	void Initialize(uint32_t initialType);
 
 	/**
 	 * @brief 仿真控制
diff --git a/XNCore/XNScenarioManager.cpp b/XNCore/XNScenarioManager.cpp
index a8547b5..68e1070 100755
--- a/XNCore/XNScenarioManager.cpp
+++ b/XNCore/XNScenarioManager.cpp
@@ -94,7 +94,7 @@ std::string getFileNameWithoutExt(const std::string &path)
 }
 
 // 运行环境配置文件解析
-bool XNScenarioManager::AnalysisScenarioXml(const std::string &XmlPath)
+bool XNScenarioManager::AnalysisScenarioXml(const std::string &XmlPath, uint32_t initialType)
 {
 	T_D();
 	std::ifstream file(XmlPath);
diff --git a/XNCore/XNScenarioManager.h b/XNCore/XNScenarioManager.h
index 9870c3c..89a293b 100755
--- a/XNCore/XNScenarioManager.h
+++ b/XNCore/XNScenarioManager.h
@@ -71,6 +71,9 @@ public:
 	/**
 	 * @brief 运行环境配置文件解析
 	 * @param XmlPath:	std::string类型，运行环境配置文件解析路径
+	 * @param initialType:	uint32_t类型，初始化类型
+	 * @return true:	解析成功
+	 * @return false:	解析失败
 	 */
-	virtual bool AnalysisScenarioXml(const std::string &XmlPath);
+	virtual bool AnalysisScenarioXml(const std::string &XmlPath, uint32_t initialType);
 };
diff --git a/XNCore/XNServiceManager.cpp b/XNCore/XNServiceManager.cpp
index 0fe8784..b7ead8b 100755
--- a/XNCore/XNServiceManager.cpp
+++ b/XNCore/XNServiceManager.cpp
@@ -1,11 +1,6 @@
 #include "XNServiceManager.h"
 #include "XNServiceManager_p.h"
 #include "XNServiceObject.h"
-#include <QLibrary>
-#include <QMetaType>
-#include <QObject>
-#include <dlfcn.h>
-#include <filesystem>
 
 XNServiceManager::XNServiceManager() : XNBaseFrameObject(new XNServiceManagerPrivate())
 {