version 3.5.2 msg: 加入夜间过滤器的开关

modules/InfineFilter/include/InfineFilter.h

@@ -3,8 +3,8 @@
  * @Version: 1.0
  * @Autor: lishengyin
  * @Date: 2022-03-22 14:00:35
- * @LastEditors: Your Name lishengyin@sz-sunwin.com
- * @LastEditTime: 2022-05-14 13:44:39
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2022-05-16 09:19:44
  */
 #ifndef __INFINEFILTER_H_
 #define __INFINEFILTER_H_
@@ -75,6 +75,7 @@ namespace cnstream{
         vector<std::string> labels;
 
         bool saveFilterResult = true;
+        bool Night_Filter = true;
         std::string files = "./output/";
 
         int start = 21;

modules/InfineFilter/src/InfineFilter.cpp

@@ -3,8 +3,8 @@
  * @Version: 1.0
  * @Autor: lishengyin
  * @Date: 2022-03-22 14:00:46
- * @LastEditors: Your Name lishengyin@sz-sunwin.com
- * @LastEditTime: 2022-05-15 22:07:45
+ * @LastEditors: lishengyin
+ * @LastEditTime: 2022-05-16 09:22:22
  */
 #include "InfineFilter.h"
 
@@ -36,6 +36,9 @@ namespace cnstream{
         if(paramSet.find("saveFilterResult") != paramSet.end()){
             this->saveFilterResult = paramSet["saveFilterResult"] == "true" ? true : false;
         }
+        if(paramSet.find("Night_Filter") != paramSet.end()){
+            this->Night_Filter = paramSet["Night_Filter"] == "true" ? true : false;
+        }
         if(paramSet.find("lock_period") != paramSet.end()){
             std::string json = paramSet["lock_period"];
             rapidjson::Document doc;
@@ -85,7 +88,8 @@ namespace cnstream{
                 iter++;
             }
         }
-        
+
+        if(!this->Night_Filter) return 0;
         if(!getNight()) return 0;
         
         // 过滤星星、月亮、飞机

source/cns_launcher/configs/InfineFilter.json

@@ -9,6 +9,7 @@
             },
             "files": "./output/",
             "saveFilterResult" : "true",
+            "Night_Filter": "true",
             "lock_period":{
                 "start": 20,
                 "end": 6