From 9f150f30b8293f2bb9fc54849cbf0afd09daab78 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Wed, 18 Dec 2024 22:33:10 +0800
Subject: [PATCH]  2.1.7

---
 README.md                                |  3 ++-
 appsrc/appconfig/basic/zappversion.hpp   |  2 +-
 appsrc/baseservice/db/setting_db_dao.cpp |  4 ++--
 appsrc/baseservice/port/project_port.cpp | 17 ++---------------
 appsrc/baseservice/port/project_port.hpp |  2 +-
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 72aca4a..e54e307 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,8 @@ VERSION 2.1.5
     2. 修改默认log
 VERSION 2.1.6
     1. 修复默认部分bug
-
+VERSION 2.1.7
+    1. 更新默认配置
 TODO:
     1. 设备使用时间维护(UI接口已经准备好，考虑是否使用文件袋放在设备中的方案)
     2. 升级方案
diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp
index 3402a89..1c3f413 100644
--- a/appsrc/appconfig/basic/zappversion.hpp
+++ b/appsrc/appconfig/basic/zappversion.hpp
@@ -1,3 +1,3 @@
 #pragma once
-#define VERSION      "2.1.6"
+#define VERSION      "2.1.7"
 #define PROJECT_NAME "TRANSMIT_DM"
\ No newline at end of file
diff --git a/appsrc/baseservice/db/setting_db_dao.cpp b/appsrc/baseservice/db/setting_db_dao.cpp
index 75198c7..414c190 100644
--- a/appsrc/baseservice/db/setting_db_dao.cpp
+++ b/appsrc/baseservice/db/setting_db_dao.cpp
@@ -4,7 +4,7 @@
  *                                    BASIC                                    *
  *******************************************************************************/
 #define SETTING_DB "setting.db"
-#define DB_VERSION "1.0.4"  // 更新这个参数，会自动重置数据库
+#define DB_VERSION "1.0.5"  // 更新这个参数，会自动重置数据库
 
 namespace iflytop {
 namespace db {
@@ -87,7 +87,6 @@ static Setting settingInitTable[] = {
     INT_SETTING(SettingId::kad_dehumidify_threshold, "消毒后除湿阈值", "0", "0", "100", /*                        */ true, false, false, false),
     BOOL_SETTING(SettingId::kenable_ad_degrade, "是否启用消毒后降解", "false", /*                                 */ true, false, false, false),
     INT_SETTING(SettingId::kad_degrade_threshold, "消毒后降解阈值", "0", "0", "100", /*                          */ true, false, false, false),
-
 };
 
 list<shared_ptr<Setting>> SettingDBDao::getRealtimeSetting() {
@@ -181,6 +180,7 @@ bool SettingDBDao::getSettingValAsBool(string name) {
   }
   return setting->val == "true";
 }
+
 void SettingDBDao::factoryReset() {
   auto settings = getAllSetting();
   for (auto& s : settings) {
diff --git a/appsrc/baseservice/port/project_port.cpp b/appsrc/baseservice/port/project_port.cpp
index e5609dc..a5382de 100644
--- a/appsrc/baseservice/port/project_port.cpp
+++ b/appsrc/baseservice/port/project_port.cpp
@@ -118,6 +118,7 @@ void ProjectPort::initProjectSetting(int projectTypeInt) {
     }
   }
   if (isDrawBarDM()) {
+
   }
 }
 // 00003069 INFO [PxxSensor]  Sensor[1] id:1 ptype:DP600 detected:1
@@ -213,21 +214,7 @@ int32_t ProjectPort::getSprayLiquidPumpMaxRPM() {
   }
   return 0;
 }
-int32_t ProjectPort::getEmptyPipeSprayPumpRPM() {
-  if (isLageSpaceDM()) {
-    return 600;
-  }
-  if (isSmallSpaceDM()) {
-    return 600;
-  }
-  if (isPipeDM()) {
-    return 600;
-  }
-  if (isDrawBarDM()) {
-    return 100;
-  }
-  return 0;
-}
+
 
 int32_t ProjectPort::getDisinfectantBucketCapacity() {
   if (isLageSpaceDM()) {
diff --git a/appsrc/baseservice/port/project_port.hpp b/appsrc/baseservice/port/project_port.hpp
index 8209d87..323f4f0 100644
--- a/appsrc/baseservice/port/project_port.hpp
+++ b/appsrc/baseservice/port/project_port.hpp
@@ -103,7 +103,7 @@ class ProjectPort {
   int32_t getDisinfectantBucketCapacity();
   int32_t getExtH2O2SensorNum();
   // int emptyPipeSprayPumpRPM = 700;
-  int32_t getEmptyPipeSprayPumpRPM();
+  // int32_t getEmptyPipeSprayPumpRPM();
   bool    isHasDisinfectantBucket();
 
  private: