Browse Source

调整了一下目录结构

zhangyang 6 years ago
parent
commit
e8b453c039

BIN
bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_ud.dll


BIN
bin/Win32/Debug/zhipuzi_pos_windows/log4cplusUD.dll


BIN
bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe


BIN
lewaimai_dispatch/RCa02172


BIN
lewaimai_dispatch/RCb02172


+ 0 - 8
lewaimai_dispatch/helper/define.h

@@ -1,11 +1,3 @@
 #pragma once
 
-//待发送RPC任务的队列长度,最多保存1万条消息,不然如果处理的群组路径规划任务过多,但是消息发送速度较慢(也就是消费速度比不上生产速度),
-//会导致队列越来越大,内存会撑爆
-#define MAX_REQUEST_MESSAGE_QUEUE 1 * 10000
 
-//发送RPC任务出去,还没有收到回调最大允许的消息数量,如果数量太大,一样的会内存撑爆
-#define MAX_SENDING_RPC_LENGTH 5 * 1000
-
-//数据库连接池数量
-#define MAX_DB_CONNECTION_NUM 200

+ 1 - 5
lewaimai_dispatch/lewaimai_dispatch_windows.cpp

@@ -1,10 +1,6 @@
 #include "pch/pch.h"
 
-#include "CLoginWnd.h"
-#include "CGameFrameWnd.h"
-
-#include "MiniDumper.h"
-CMiniDumper g_miniDumper(true);
+#include "wnd/CLoginWnd.h"
 
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	_In_opt_ HINSTANCE hPrevInstance,

+ 8 - 12
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj

@@ -193,8 +193,8 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="CGameFrameWnd.h" />
-    <ClInclude Include="CLoginWnd.h" />
+    <ClInclude Include="wnd\CGameFrameWnd.h" />
+    <ClInclude Include="wnd\CLoginWnd.h" />
     <ClInclude Include="helper\MD5.h" />
     <ClInclude Include="network\CZhipuziHttpClient.h" />
     <ClInclude Include="helper\CConfigReader.h" />
@@ -202,17 +202,15 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="helper\CRandomHelper.h" />
     <ClInclude Include="helper\define.h" />
     <ClInclude Include="network\CHttpClient.h" />
-    <ClInclude Include="MiniDumper.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="wnd\MiniDumper.h" />
+    <ClInclude Include="resource\resource.h" />
     <ClInclude Include="tool\CLewaimaiLog.h" />
     <ClInclude Include="pch\pch.h" />
-    <ClInclude Include="tool\CLewaimaiDistance.h" />
-    <ClInclude Include="tool\CLewaimaiPos.h" />
     <ClInclude Include="tool\CLewaimaiTime.h" />
     <ClInclude Include="helper\CSystem.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CLoginWnd.cpp" />
+    <ClCompile Include="wnd\CLoginWnd.cpp" />
     <ClCompile Include="helper\MD5.cpp" />
     <ClCompile Include="network\CZhipuziHttpClient.cpp" />
     <ClCompile Include="helper\CConfigReader.cpp" />
@@ -220,22 +218,20 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClCompile Include="helper\CRandomHelper.cpp" />
     <ClCompile Include="helper\CSystem.cpp" />
     <ClCompile Include="network\CHttpClient.cpp" />
-    <ClCompile Include="MiniDumper.cpp" />
+    <ClCompile Include="wnd\MiniDumper.cpp" />
     <ClCompile Include="tool\CLewaimaiLog.cpp" />
     <ClCompile Include="lewaimai_dispatch_windows.cpp" />
     <ClCompile Include="pch\pch.cpp" />
-    <ClCompile Include="tool\CLewaimaiDistance.cpp" />
-    <ClCompile Include="tool\CLewaimaiPos.cpp" />
     <ClCompile Include="tool\CLewaimaiTime.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="conf\dispatch.conf" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="zhipuzi_pos_windows.rc" />
+    <ResourceCompile Include="resource\zhipuzi_pos_windows.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="duilib.ico" />
+    <Image Include="resource\duilib.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

+ 16 - 28
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.filters

@@ -18,12 +18,6 @@
     <ClInclude Include="pch\pch.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="tool\CLewaimaiDistance.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="tool\CLewaimaiPos.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="tool\CLewaimaiTime.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -45,25 +39,25 @@
     <ClInclude Include="helper\define.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="CLoginWnd.h">
+    <ClInclude Include="network\CHttpClient.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="MiniDumper.h">
+    <ClInclude Include="network\CZhipuziHttpClient.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="helper\MD5.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="CGameFrameWnd.h">
+    <ClInclude Include="wnd\CGameFrameWnd.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="network\CHttpClient.h">
+    <ClInclude Include="wnd\CLoginWnd.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="network\CZhipuziHttpClient.h">
+    <ClInclude Include="wnd\MiniDumper.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="helper\MD5.h">
+    <ClInclude Include="resource\resource.h">
       <Filter>头文件</Filter>
     </ClInclude>
   </ItemGroup>
@@ -74,12 +68,6 @@
     <ClCompile Include="pch\pch.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="tool\CLewaimaiDistance.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="tool\CLewaimaiPos.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="tool\CLewaimaiTime.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -98,19 +86,19 @@
     <ClCompile Include="helper\CSystem.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="CLoginWnd.cpp">
+    <ClCompile Include="network\CHttpClient.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="MiniDumper.cpp">
+    <ClCompile Include="network\CZhipuziHttpClient.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="network\CHttpClient.cpp">
+    <ClCompile Include="helper\MD5.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="network\CZhipuziHttpClient.cpp">
+    <ClCompile Include="wnd\CLoginWnd.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="helper\MD5.cpp">
+    <ClCompile Include="wnd\MiniDumper.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>
@@ -118,13 +106,13 @@
     <None Include="conf\dispatch.conf" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="zhipuzi_pos_windows.rc">
+    <Image Include="resource\duilib.ico">
       <Filter>资源文件</Filter>
-    </ResourceCompile>
+    </Image>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="duilib.ico">
+    <ResourceCompile Include="resource\zhipuzi_pos_windows.rc">
       <Filter>资源文件</Filter>
-    </Image>
+    </ResourceCompile>
   </ItemGroup>
 </Project>

+ 4 - 6
lewaimai_dispatch/pch/pch.h

@@ -19,8 +19,11 @@
 #include <sys/sysinfo.h>
 #endif
 
+#include <objbase.h>
+#include <zmouse.h>
+
 //资源文件
-#include "../resource.h"
+#include "../resource/resource.h"
 
  /*
  标准库头文件
@@ -60,14 +63,9 @@ using namespace std;
 
 #include "../tool/CLewaimaiLog.h"
 #include "../tool/CLewaimaiTime.h"
-#include "../tool/CLewaimaiPos.h"
-#include "../tool/CLewaimaiDistance.h"
 
 #include "../network/CZhipuziHttpClient.h"
 
-#include <objbase.h>
-#include <zmouse.h>
-
 #include <DuiLib/UIlib.h>
 using namespace DuiLib;
 

lewaimai_dispatch/duilib.ico → lewaimai_dispatch/resource/duilib.ico


lewaimai_dispatch/resource.h → lewaimai_dispatch/resource/resource.h


BIN
lewaimai_dispatch/zhipuzi_pos_windows.aps


lewaimai_dispatch/zhipuzi_pos_windows.rc → lewaimai_dispatch/resource/zhipuzi_pos_windows.rc


+ 0 - 31
lewaimai_dispatch/tool/CLewaimaiDistance.cpp

@@ -1,31 +0,0 @@
-#include "../pch/pch.h"
-#include "CLewaimaiDistance.h"
-
-#define PI 3.141592657
-#define EARTH_RADIUS  6378137
-
-CLewaimaiDistance::CLewaimaiDistance()
-{
-}
-
-
-CLewaimaiDistance::~CLewaimaiDistance()
-{
-}
-
-double CLewaimaiDistance::getDistance(CLewaimaiPos pos1, CLewaimaiPos pos2)
-{
-	double Rad = PI / 180.0;
-
-	double radlat1 = pos1.lat * Rad;
-	double radlat2 = pos2.lat * Rad;
-
-	double a = radlat1 - radlat2;
-	double b = (pos1.lng - pos2.lng) * Rad;
-
-	double s = 2 * asin(sqrt(pow(sin(a / 2), 2) + cos(radlat1)*cos(radlat2)*pow(sin(b / 2), 2)));
-	s = s * EARTH_RADIUS;
-	s = round(s * 10000) / 10000;
-
-	return s;
-}

+ 0 - 13
lewaimai_dispatch/tool/CLewaimaiDistance.h

@@ -1,13 +0,0 @@
-#pragma once
-
-class CLewaimaiPos;
-
-class CLewaimaiDistance
-{
-public:
-	CLewaimaiDistance();
-	~CLewaimaiDistance();
-
-	static double getDistance(CLewaimaiPos pos1, CLewaimaiPos pos2);
-};
-

+ 0 - 18
lewaimai_dispatch/tool/CLewaimaiPos.cpp

@@ -1,18 +0,0 @@
-#include "../pch/pch.h"
-#include "CLewaimaiPos.h"
-
-
-CLewaimaiPos::CLewaimaiPos()
-{
-}
-
-
-CLewaimaiPos::~CLewaimaiPos()
-{
-}
-
-CLewaimaiPos::CLewaimaiPos(double lat, double lng)
-{
-	this->lat = lat;
-	this->lng = lng;
-}

+ 0 - 14
lewaimai_dispatch/tool/CLewaimaiPos.h

@@ -1,14 +0,0 @@
-#pragma once
-
-class CLewaimaiPos
-{
-public:
-	double lat;
-	double lng;
-public:
-	CLewaimaiPos();
-	~CLewaimaiPos();
-
-	CLewaimaiPos(double lat, double lng);
-};
-

+ 1 - 1
lewaimai_dispatch/CGameFrameWnd.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "pch/pch.h"
+#include "../pch/pch.h"
 
 class CGameFrameWnd : public CWindowWnd, public INotifyUI
 {

+ 1 - 1
lewaimai_dispatch/CLoginWnd.cpp

@@ -1,4 +1,4 @@
-#include "pch/pch.h"
+#include "../pch/pch.h"
 #include "CLoginWnd.h"
 
 void CLoginFrameWnd::HandleLogin()

+ 1 - 3
lewaimai_dispatch/CLoginWnd.h

@@ -1,10 +1,8 @@
 #pragma once
 
-#include "pch/pch.h"
+#include "../pch/pch.h"
 #include "CGameFrameWnd.h"
 
-
-
 class CLoginFrameWnd : public CWindowWnd, public INotifyUI, public IMessageFilterUI
 {
 public:

lewaimai_dispatch/MiniDumper.cpp → lewaimai_dispatch/wnd/MiniDumper.cpp


lewaimai_dispatch/MiniDumper.h → lewaimai_dispatch/wnd/MiniDumper.h