v1.0.10

README.md

@@ -43,4 +43,8 @@ VERSION 1.0.8
 
 VERSION 1.0.9
     1. 修改加液时，排液时间
+
+VERSION 1.0.10
+    1. 修正gpm和rpm转换系数
+    2. 支持存放应用的静态网页
 ```

appsrc/appsetting/project_port/basic/project_constant.hpp

@@ -18,9 +18,9 @@
 #define MAX_SUPPORT_SENSOR 3
 
 // GPM_TO_SPEED_RADIO
-#define LARGE_SPACE_DM__GPM_TO_SPEED_RADIO (11.0250)
-#define SMALL_SPACE_DM__GPM_TO_SPEED_RADIO (11.0250)
-#define PIPE_DM_GPM_TO_SPEED_RADIO        (11.0250)
+#define LARGE_SPACE_DM__GPM_TO_SPEED_RADIO (11.3070)
+#define SMALL_SPACE_DM__GPM_TO_SPEED_RADIO (11.3070)
+#define PIPE_DM_GPM_TO_SPEED_RADIO        (11.3070)
 #define DRAW_BAR_DM_GPM_TO_SPEED_RADIO    (41.97)
 
 // EXT_SENSOR_NUM

appsrc/appsetting/project_port/basic/zappversion.hpp

@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "1.0.9"
+#define VERSION      "1.0.10"
 #define PROJECT_NAME "TRANSMIT_DM"

appsrc/baseservice/app_http_server/app_http_server.cpp

@@ -0,0 +1,19 @@
+#include "app_http_server.hpp"
+using namespace iflytop;
+using namespace std;
+
+void AppHttpServer::initialize() {
+  appthread.reset(new Thread("AppHttpServer-Debug", [this]() {
+    logger->info("AppHttpServer::initialize Debug");
+    Server svr;
+    svr.set_base_dir("./html/debug/");
+    svr.listen("0.0.0.0", 8081);
+  }));
+
+  debugthread.reset(new Thread("AppHttpServer-App", [this]() {
+    logger->info("AppHttpServer::initialize App");
+    Server svr;
+    svr.set_base_dir("./html/app/");
+    svr.listen("0.0.0.0", 80);
+  }));
+}

appsrc/baseservice/debugpage/debugpage.hpp → appsrc/baseservice/app_http_server/app_http_server.hpp

@@ -34,15 +34,16 @@ using namespace std;
 using namespace core;
 using namespace httplib;
 
-class DebugPage {
-  THISCLASS(DebugPage)
+class AppHttpServer {
+  THISCLASS(AppHttpServer)
  private:
   /* data */
-  unique_ptr<Thread> thread;
+  unique_ptr<Thread> appthread;
+  unique_ptr<Thread> debugthread;
 
  public:
-  DebugPage(/* args */) {}
-  ~DebugPage() {}
+  AppHttpServer(/* args */) {}
+  ~AppHttpServer() {}
 
   void initialize();
 };

appsrc/baseservice/debugpage/debugpage.cpp

@@ -1,12 +0,0 @@
-#include "debugpage.hpp"
-using namespace iflytop;
-using namespace std;
-
-void DebugPage::initialize() {
-  thread.reset(new Thread("DebugPage", [this]() {
-    logger->info("DebugPage::initialize");
-    Server svr;
-    svr.set_base_dir("./html/debug/");
-    svr.listen("0.0.0.0", 8081);
-  }));
-}

appsrc/service/app_core.cpp

@@ -1,7 +1,7 @@
 #include "app_core.hpp"
 
 #include "baseservice/baseservice.hpp"
-#include "baseservice/debugpage/debugpage.hpp"
+#include "baseservice/app_http_server/app_http_server.hpp"
 #include "service/audit_mgr_service.hpp"
 #include "service/debug_page_test_service.hpp"
 #include "service/device_info_mgr_service.hpp"
@@ -118,7 +118,7 @@ void AppCore::initialize() {
   installEcodeInfo();
   // FrontEnd
   BUILD_AND_REG_SERRVICE(IflytopFrontEndService);
-  BUILD_AND_REG_SERRVICE(DebugPage);
+  BUILD_AND_REG_SERRVICE(AppHttpServer);
 
   // Data
   ProjectPort::ins().initialize();