Merge remote-tracking branch 'origin/master'

src/MapLocation.h

@@ -3,6 +3,8 @@
 #include "MapLocationBase.h"
 #include "HdLib.h"
 #include "MapMatching.hpp"
+#include <thread>
+#include <mutex>
 
 namespace JfxLocation
 {
@@ -10,6 +12,7 @@ namespace JfxLocation
 	{
 	public:
 		MapLocation(const std::string& project, const std::string& config);
+		~MapLocation();
 
 		virtual int SetMatchingResultCallback(MatchingResultCallback cb);
 		virtual int PushGPSFrame(GPSFrame& gps);
@@ -17,8 +20,15 @@ namespace JfxLocation
 		virtual int PushLocation(Location& loc);
 
 	public:
+		void ThreadProcess();
+
+
 		jf::MapMatching m_mmMatch;
+		bool m_isRun = false;//记录是否在运行
+		std::thread m_thread;//运行线程
+		std::mutex m_mtx;
 
+		MatchingResultCallback m_cb = nullptr;
 	};
 }