tdoa

YAServer.vcxproj

@@ -94,11 +94,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<<<<<<< HEAD
       <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-=======
-      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
->>>>>>> 74365facd04b6031dc9c7b857d7992ae06100141
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

YAServer.vcxproj.bak

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4DB4D27B-7F2C-474A-8CA5-0B6CCEF59B3B}</ProjectGuid>
+    <RootNamespace>YAServer</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\output\$(Configuration)\bin\</OutDir>
+    <IntDir>$(SolutionDir)..\IntDir\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IncludePath>$(BOOST)\;..\common\;..\thirdparty\include\socket.io-client-cpp\src\;..\thirdparty\include\rapidjson\include\;..\thirdparty\include\websocketpp\;..\thirdparty\include\mysql\;..\thirdparty\include\iocp\common\Src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(BOOST)\stage\lib;..\thirdparty\lib\mysql\;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\output\$(Configuration)\bin\</OutDir>
+    <IntDir>$(SolutionDir)..\IntDir\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IncludePath>$(BOOST)\;..\common\;..\thirdparty\include\socket.io-client-cpp\src\;..\thirdparty\include\rapidjson\include\;..\thirdparty\include\websocketpp\;..\thirdparty\include\mysql\;..\thirdparty\include\iocp\common\Src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(BOOST)\stage_11\lib;..\thirdparty\lib\mysql\;$(LibraryPath)</LibraryPath>
+    <ExtensionsToDeleteOnClean>*.aps;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)\..\Symbol\$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib\$(Configuration)\;..\thirdparty\lib\mysql\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>jsoncpp_110.lib;libmysql.lib;libboost_system-vc110-mt-gd-1_58.lib;libboost_date_time-vc110-mt-gd-1_58.lib;libboost_random-vc110-mt-gd-1_58.lib</AdditionalDependencies>
+    </Link>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0804</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>xcopy "$(SolutionDir)..\..\output\$(Configuration)\bin\YAServer.exe" "D:\0a-share\$(Configuration)\" /Y /C /D /S</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
+      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 74365facd04b6031dc9c7b857d7992ae06100141
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ProgramDatabaseFile>$(OutDir)\..\Symbol\$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib\$(Configuration)\;..\thirdparty\lib\mysql\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>jsoncpp_110.lib;libmysql.lib;libboost_system-vc110-mt-1_58.lib;libboost_date_time-vc110-mt-1_58.lib;libboost_random-vc110-mt-1_58.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0804</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>xcopy "$(SolutionDir)..\..\output\$(Configuration)\bin\YAServer.exe" "D:\0a-share\$(Configuration)\" /Y /C /D /S
+xcopy "$(SolutionDir)..\config.ini" "D:\0a-share\$(Configuration)\" /Y /C /D /S</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\config.ini" />
+    <None Include="ReadMe.txt" />
+    <None Include="res\YAServer.ico" />
+    <None Include="res\YAServer.rc2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\def_msg.h" />
+    <ClInclude Include="..\common\Functions\deca_range_optimize.h" />
+    <ClInclude Include="..\common\Functions\Functions.h" />
+    <ClInclude Include="..\common\json\json.h" />
+    <ClInclude Include="..\common\kalman\locate.h" />
+    <ClInclude Include="..\common\matrix\_Matrix.h" />
+    <ClInclude Include="..\common\ReportCtrl\ReportCtrl.h" />
+    <ClInclude Include="..\common\strconv\strconv.h" />
+    <ClInclude Include="..\common\structdef.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\bufferpool.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\bufferptr.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\CriticalSection.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\Event.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\GeneralHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\PrivateHeap.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\RWLock.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\Semaphore.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\STLHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\SysHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\WaitFor.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\Win32Helper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Global\helper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Src\SocketHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Src\SocketInterface.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Src\TcpServer.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_client_impl.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_packet.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\sio_client.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\sio_socket.h" />
+    <ClInclude Include="classdef.h" />
+    <ClInclude Include="constdef.h" />
+    <ClInclude Include="DbSettingDlg.h" />
+    <ClInclude Include="def.h" />
+    <ClInclude Include="LogSetting.h" />
+    <ClInclude Include="log_def.h" />
+    <ClInclude Include="MysqlConnPool.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="SyncTime\Common.h" />
+    <ClInclude Include="SyncTime\SyncHelper.h" />
+    <ClInclude Include="SyncTime\SyncManager.h" />
+    <ClInclude Include="SyncTime\Position.h" />
+    <ClInclude Include="SyncTime\SyncTime.h" />
+    <ClInclude Include="SyncTime\SyncTimeMsg.h" />
+    <ClInclude Include="SyncTime\TagMsg.h" />
+    <ClInclude Include="SysSetting.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="YAServer.h" />
+    <ClInclude Include="YAServerDlg.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\Functions\deca_range_optimize.cpp" />
+    <ClCompile Include="..\common\Functions\Functions.cpp" />
+    <ClCompile Include="..\common\kalman\locate.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\common\kalman\Smoother.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\common\matrix\_Matrix.cpp" />
+    <ClCompile Include="..\common\ReportCtrl\ReportCtrl.cpp" />
+    <ClCompile Include="..\common\strconv\strconv.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\bufferpool.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\RWLock.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\SysHelper.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\WaitFor.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\Global\helper.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\Src\SocketHelper.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\Src\TcpServer.cpp" />
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_client_impl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_packet.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\sio_client.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\common\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\sio_socket.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="classdef.cpp" />
+    <ClInclude Include="locate_algorithm.h">
+      <FileType>CppCode</FileType>
+    </ClInclude>
+    <ClCompile Include="DbSettingDlg.cpp" />
+    <ClCompile Include="locate_algorithm.cpp" />
+    <ClCompile Include="LogSetting.cpp" />
+    <ClCompile Include="MysqlConnPool.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="SyncTime\SyncHelper.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="SyncTime\SyncManager.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="SysSetting.cpp" />
+    <ClCompile Include="YAServer.cpp" />
+    <ClCompile Include="YAServerDlg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="YAServer.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="YAServer.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

YAServer.vcxproj.orig

@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4DB4D27B-7F2C-474A-8CA5-0B6CCEF59B3B}</ProjectGuid>
+    <RootNamespace>YAServer</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\output\$(Configuration)\bin\</OutDir>
+    <IntDir>$(SolutionDir)..\IntDir\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IncludePath>$(BOOST)\;..\common\;..\thirdparty\include\socket.io-client-cpp\src\;..\thirdparty\include\rapidjson\include\;..\thirdparty\include\websocketpp\;..\thirdparty\include\mysql\;..\thirdparty\include\iocp\common\Src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(BOOST)\stage\lib;..\thirdparty\lib\mysql\;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\output\$(Configuration)\bin\</OutDir>
+    <IntDir>$(SolutionDir)..\IntDir\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IncludePath>$(BOOST)\;..\common\;..\thirdparty\include\socket.io-client-cpp\src\;..\thirdparty\include\rapidjson\include\;..\thirdparty\include\websocketpp\;..\thirdparty\include\mysql\;..\thirdparty\include\iocp\common\Src\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(BOOST)\stage_11\lib;..\thirdparty\lib\mysql\;$(LibraryPath)</LibraryPath>
+    <ExtensionsToDeleteOnClean>*.aps;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)\..\Symbol\$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib\$(Configuration)\;..\thirdparty\lib\mysql\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>jsoncpp_110.lib;libmysql.lib;libboost_system-vc110-mt-gd-1_58.lib;libboost_date_time-vc110-mt-gd-1_58.lib;libboost_random-vc110-mt-gd-1_58.lib</AdditionalDependencies>
+    </Link>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0804</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>xcopy "$(SolutionDir)..\..\output\$(Configuration)\bin\YAServer.exe" "D:\0a-share\$(Configuration)\" /Y /C /D /S</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
+      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+=======
+      <AdditionalIncludeDirectories>..\common\json;..\thirdparty\eigen\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+>>>>>>> 74365facd04b6031dc9c7b857d7992ae06100141
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ProgramDatabaseFile>$(OutDir)\..\Symbol\$(TargetName).pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\lib\$(Configuration)\;..\thirdparty\lib\mysql\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>jsoncpp_110.lib;libmysql.lib;libboost_system-vc110-mt-1_58.lib;libboost_date_time-vc110-mt-1_58.lib;libboost_random-vc110-mt-1_58.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0804</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Command>xcopy "$(SolutionDir)..\..\output\$(Configuration)\bin\YAServer.exe" "D:\0a-share\$(Configuration)\" /Y /C /D /S
+xcopy "$(SolutionDir)..\config.ini" "D:\0a-share\$(Configuration)\" /Y /C /D /S</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\config.ini" />
+    <None Include="ReadMe.txt" />
+    <None Include="res\YAServer.ico" />
+    <None Include="res\YAServer.rc2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\common\def_msg.h" />
+    <ClInclude Include="..\common\Functions\deca_range_optimize.h" />
+    <ClInclude Include="..\common\Functions\Functions.h" />
+    <ClInclude Include="..\common\json\json.h" />
+    <ClInclude Include="..\common\kalman\locate.h" />
+    <ClInclude Include="..\common\matrix\_Matrix.h" />
+    <ClInclude Include="..\common\ReportCtrl\ReportCtrl.h" />
+    <ClInclude Include="..\common\strconv\strconv.h" />
+    <ClInclude Include="..\common\structdef.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\bufferpool.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\bufferptr.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\CriticalSection.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\Event.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\GeneralHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\PrivateHeap.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\RWLock.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\Semaphore.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\STLHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\SysHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\WaitFor.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\common\Src\Win32Helper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Global\helper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Src\SocketHelper.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Src\SocketInterface.h" />
+    <ClInclude Include="..\thirdparty\include\iocp\Src\TcpServer.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_client_impl.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_packet.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\sio_client.h" />
+    <ClInclude Include="..\thirdparty\include\socket.io-client-cpp\src\sio_socket.h" />
+    <ClInclude Include="classdef.h" />
+    <ClInclude Include="constdef.h" />
+    <ClInclude Include="DbSettingDlg.h" />
+    <ClInclude Include="def.h" />
+    <ClInclude Include="LogSetting.h" />
+    <ClInclude Include="log_def.h" />
+    <ClInclude Include="MysqlConnPool.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="SyncTime\Common.h" />
+    <ClInclude Include="SyncTime\SyncHelper.h" />
+    <ClInclude Include="SyncTime\SyncManager.h" />
+    <ClInclude Include="SyncTime\Position.h" />
+    <ClInclude Include="SyncTime\SyncTime.h" />
+    <ClInclude Include="SyncTime\SyncTimeMsg.h" />
+    <ClInclude Include="SyncTime\TagMsg.h" />
+    <ClInclude Include="SysSetting.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="YAServer.h" />
+    <ClInclude Include="YAServerDlg.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\common\Functions\deca_range_optimize.cpp" />
+    <ClCompile Include="..\common\Functions\Functions.cpp" />
+    <ClCompile Include="..\common\kalman\locate.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\common\kalman\Smoother.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\common\matrix\_Matrix.cpp" />
+    <ClCompile Include="..\common\ReportCtrl\ReportCtrl.cpp" />
+    <ClCompile Include="..\common\strconv\strconv.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\bufferpool.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\RWLock.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\SysHelper.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\common\Src\WaitFor.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\Global\helper.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\Src\SocketHelper.cpp" />
+    <ClCompile Include="..\thirdparty\include\iocp\Src\TcpServer.cpp" />
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_client_impl.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\internal\sio_packet.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\sio_client.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\common\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\thirdparty\include\socket.io-client-cpp\src\sio_socket.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="classdef.cpp" />
+    <ClInclude Include="locate_algorithm.h">
+      <FileType>CppCode</FileType>
+    </ClInclude>
+    <ClCompile Include="DbSettingDlg.cpp" />
+    <ClCompile Include="locate_algorithm.cpp" />
+    <ClCompile Include="LogSetting.cpp" />
+    <ClCompile Include="MysqlConnPool.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="SyncTime\SyncHelper.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="SyncTime\SyncManager.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="SysSetting.cpp" />
+    <ClCompile Include="YAServer.cpp" />
+    <ClCompile Include="YAServerDlg.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="YAServer.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="YAServer.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

YAServerDlg.h

@@ -334,7 +334,6 @@ public:
 	void send_sync_reader();
 	void clear_call_info();
 	int get_card_id_len(int card_type);
-	int init_antenna_sync();
 	void Test();
 public:
 	std::unique_ptr<client> _io;

classdef.cpp

@@ -634,10 +634,10 @@ void Card::get_coordinate( int cnt )
 	//pRdm[nCount]  = *prd;
 	pRdm.insert(ReceiveDataMap::value_type(prd2->reader_id,*prd2));*/
 
-	if(t == 6446){
+	if(t == 5725){
 		int ddd = cnt;
+		ddd = ddd*5;
 		ddd = t;
-	
 	}
 
 	if(pTdoaReaderPathMap->size() > 0 && pRdm.size() > 1){