~chenshijun/c++.git

			@@ -951,7 +951,7 @@

			void devHttpServer_c::killVideoAnalysFromHCApp() const {
			string local_passwd = appConfig.getStringProperty("localPasswd");
			string cmd_kill = "echo \"" + local_passwd + "\" \| sudo -S pkill -9 VideoAnalysFrom";
			string cmd_kill = "echo \"" + local_passwd + "\" \| sudo -S pkill -9 VideoAnalys";
			system(cmd_kill.c_str());
			DBG("system(\"sudo -S pkill -9 VideoAnalysFromHC\");");
			}

			@@ -461,7 +461,7 @@
			"error": "erlang is null"
			}

			æ¥æ¾åæ¥åºåº findLocalDatabase
			æ¥æ¾æ¬å°åºåº findLocalDatabase
			ä¸åï¼æ
			è¿åï¼
			[{

			@@ -169,7 +169,7 @@
			INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
			m_triggerElement.setState(state);
			m_triggerElement.triggerOnce();
			if (m_triggerElement.getTriggerState() )
			if (m_triggerElement.getTriggerState())
			{
			if(num > 0) {
			if(pointArray!=nullptr)
			@@ -178,7 +178,7 @@

			int npt[]={npts};

			cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
			cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
			}

			for(auto rect:m_recVec)
			@@ -196,6 +196,10 @@
			}
			DBG("num=" << num << " lastnum=" << mRealNum);
			mRealNum = num;

			//todo éç½®æ¥è¦trigger
			m_triggerElement.setState(false);
			m_triggerElement.triggerOnce();
			}

			// if (m_triggerElement.getTriggerState() && num!=mRealNum)

	QiaoJiaSystem/DataManagerServer/http_configserver.cpp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/DataManagerServer/web-server接口.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/StructureApp/PerimeterElement.cpp	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史