整理代码

test/DeviceHK.cpp

@@ -6,8 +6,8 @@
  */
 #ifdef ENABLE_HKDEVICE
 #include "DeviceHK.h"
-#include "Util/TimeTicker.h"
 #include "Util/MD5.h"
+#include "Util/TimeTicker.h"
 namespace ZL {
 namespace DEV {
 

test/DeviceHK.h

@@ -9,8 +9,8 @@
 #define DEVICE_DEVICEHK_H_
 
 #include <sys/time.h>
-#include "HCNetSDK.h"
 #include "PlayM4.h"
+#include "HCNetSDK.h"
 #include "Device/Device.h"
 #include "Util/onceToken.h"
 #include "Util/logger.h"

test/test.cpp

@@ -8,20 +8,20 @@
 #include <signal.h>
 #include <unistd.h>
 #include <iostream>
-#include "Util/SqlPool.h"
-#include "Util/logger.h"
-#include "Util/onceToken.h"
 #include "Rtsp/UDPServer.h"
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
-#include "Network/TcpServer.h"
-#include "Poller/EventPoller.hpp"
-#include "Thread/WorkThreadPool.h"
 #include "Http/HttpSession.h"
 #include "Http/HttpsSession.h"
 #include "Util/SSLBox.h"
+#include "Util/SqlPool.h"
+#include "Util/logger.h"
+#include "Util/onceToken.h"
+#include "Network/TcpServer.h"
+#include "Poller/EventPoller.h"
+#include "Thread/WorkThreadPool.h"
 #ifdef ENABLE_HKDEVICE
-#include "test/DeviceHK.h"
+#include "DeviceHK.h"
 #endif //ENABLE_HKDEVICE
 
 using namespace std;