[ref]iot_application -> iot_app

product/src/application/apc_if_srv/ApcIfSrvCommon.cpp

@@ -16,7 +16,7 @@
 
 #include "ApcIfSrvCommon.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 const char *g_pSzProcName = "apc_if_srv";
@@ -61,4 +61,4 @@ bool splitKeyIdTag(const std::string &strKeyIdTag,
     return true;
 }
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/apc_if_srv/ApcIfSrvCommon.h

@@ -12,7 +12,7 @@
 #include "service/common/RdbTableDefine.h"
 #include "service/common/CommonDefine.h"
 
-namespace iot_application
+namespace iot_app
 {
 extern const char *g_pSzProcName;
 
@@ -21,4 +21,4 @@ bool splitKeyIdTag(const std::string &strKeyIdTag,
                    std::string *pStrTagName = NULL,
                    std::string *pStrColumnName = NULL);
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/apc_if_srv/CApcIfRedunSw.cpp

@@ -14,7 +14,7 @@
 
 #include "CApcIfRedunSw.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 CApcIfRedunSw::CApcIfRedunSw()
@@ -70,5 +70,5 @@ int CApcIfRedunSw::redundantSwitch(bool bMaster, bool bSlave)
     return iotSuccess;
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CApcIfRedunSw.h

@@ -11,7 +11,7 @@
 
 #include "sys_node_mng_api/NodeMngInterface.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CThreadAnalog;
@@ -41,5 +41,5 @@ private:
 
 typedef boost::shared_ptr<CApcIfRedunSw> CApcIfRedunSwPtr;
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CApcIfSrv.cpp

@@ -20,7 +20,7 @@
 #include "ApcIfSrvCommon.h"
 #include "CApcIfSrv.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 bool g_bVerboseLog = false;
@@ -501,5 +501,5 @@ unsigned int CApcIfSrv::getInvalidStatus_DI() const
     return m_nInvalidStatus_DI;
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CApcIfSrv.h

@@ -15,7 +15,7 @@
 
 #include "CApcIfRedunSw.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CApcIfSrv :
@@ -112,4 +112,4 @@ private:
     iot_service::CAlmApiForAppPtr m_ptrAlmApi;  //< 报警服务接口
 };
 
-} //< namespace iot_application
+} //< namespace iot_app

product/src/application/apc_if_srv/CThreadAnalog.cpp

@@ -47,7 +47,7 @@
 
 #include "CThreadAnalog.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 extern bool g_bVerboseLog;
@@ -692,5 +692,5 @@ void CThreadAnalog::handleOutput()
     }
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CThreadAnalog.h

@@ -15,7 +15,7 @@
 #include "rdb_api/CRdbAccess.h"
 #include "OptDataMessage.pb.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CThreadAnalog
@@ -58,5 +58,5 @@ private:
 
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CThreadDigital.cpp

@@ -46,7 +46,7 @@
 
 #include "CThreadDigital.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 extern bool g_bVerboseLog;
@@ -518,5 +518,5 @@ void CThreadDigital::handleOutput()
     m_objSetDataToDp.clear_seq_set_data_info();
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CThreadDigital.h

@@ -15,7 +15,7 @@
 #include "rdb_api/CRdbAccess.h"
 #include "OptDataMessage.pb.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CThreadDigital
@@ -57,5 +57,5 @@ private:
 
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/CThreadLocalCurve.cpp

@@ -45,7 +45,7 @@
 
 #include "CThreadLocalCurve.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 extern bool g_bVerboseLog;
@@ -764,4 +764,4 @@ void CThreadLocalCurve::updateModelCurrentDayRuleId(const char *pSzKeyIdTag, con
     }
 }
 
-} //< namespace iot_application
+} //< namespace iot_app

product/src/application/apc_if_srv/CThreadLocalCurve.h

@@ -18,7 +18,7 @@
 #include "rdb_api/CRdbAccess.h"
 #include "OptDataMessage.pb.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CThreadLocalCurve
@@ -116,5 +116,5 @@ private:
 
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/apc_if_srv/Main.cpp

@@ -12,8 +12,8 @@
 int main(int argc, char *argv[])
 {
     //< 控制单例生命周期
-    iot_application::CApcIfSrv::GC objSrvGc;
+    iot_app::CApcIfSrv::GC objSrvGc;
 
-    return iot_application::CApcIfSrv::getInstance().main(argc, argv);
+    return iot_app::CApcIfSrv::getInstance().main(argc, argv);
 }
 

product/src/application/fault_recall_srv/CFaultRecallRedunSw.cpp

@@ -11,7 +11,7 @@
 
 #include "CFaultRecallRedunSw.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 CFaultRecallRedunSw::CFaultRecallRedunSw()
@@ -55,5 +55,5 @@ int CFaultRecallRedunSw::redundantSwitch(bool bMaster, bool bSlave)
     return iotSuccess;
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CFaultRecallRedunSw.h

@@ -14,7 +14,7 @@
 #include "CTriggerThread.h"
 #include "CListenThread.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CFaultRecallRedunSw : public ::iot_sys::CRedundantSwitchInterface
@@ -36,5 +36,5 @@ private:
 
 typedef boost::shared_ptr<CFaultRecallRedunSw> CFaultRecallRedunSwPtr;
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CFaultRecallSrv.cpp

@@ -21,7 +21,7 @@
 
 bool g_bVerboseLog = false;
 
-namespace iot_application
+namespace iot_app
 {
 
 static const char *g_pSzProcName = "fault_recall_srv";
@@ -405,5 +405,5 @@ bool CFaultRecallSrv::loadSysInfo()
     return true;
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CFaultRecallSrv.h

@@ -14,7 +14,7 @@
 
 #include "CFaultRecallRedunSw.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CFaultRecallSrv :
@@ -78,5 +78,5 @@ private:
     iot_sys::CRedundantMngInterfacePtr    m_ptrRedundantMng;
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CHisDataMng.cpp

@@ -22,7 +22,7 @@
 
 extern bool g_bVerboseLog;
 
-namespace iot_application
+namespace iot_app
 {
 CHisDataMng::CHisDataMng(boost::int64_t nTimeBegin,
                          boost::int64_t nTimeEnd) :
@@ -824,5 +824,5 @@ bool CHisDataMng::loadSampleFromTsdb()
     return true;
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CHisDataMng.h

@@ -41,7 +41,7 @@
 #include "dp_chg_data_api/CDpcdaForDp.h"
 #include "db_his_query_api/DbHisQueryApi.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CHisDataMng
@@ -205,4 +205,4 @@ private:
     MeasPointMap m_mapAcc;
 };
 
-} //< namespace iot_application
+} //< namespace iot_app

product/src/application/fault_recall_srv/CListenThread.cpp

@@ -16,7 +16,7 @@
 #include "CFaultRecallSrv.h"
 #include "CListenThread.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 //< 1ms一次，靠通讯器超时时间休息
@@ -321,5 +321,5 @@ void CListenThread::sendSessStateReject(const char *pszSess)
     m_pMbComm->sendMsgToDomain(objMbMsgSend, -1);
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CListenThread.h

@@ -21,7 +21,7 @@
 #include "fault_recall_srv/JsonMsgClass.h"
 #include "CSessionThread.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CListenThread
@@ -63,5 +63,5 @@ private:
     CSessionThread *m_pSessThread; //< 会话线程
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CSessionThread.cpp

@@ -17,7 +17,7 @@
 #include "CFaultRecallSrv.h"
 #include "CSessionThread.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 static const unsigned int g_nEventQueueMaxSize = 10000;
@@ -457,5 +457,5 @@ void CSessionThread::sendFullFrame(boost::int64_t nTime)
     LOGDEBUG("sendFullFrame() : end\n");
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CSessionThread.h

@@ -20,7 +20,7 @@
 #include "fault_recall_srv/JsonMsgClass.h"
 #include "CHisDataMng.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CSessionThread
@@ -118,5 +118,5 @@ private:
 
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CTriggerThread.cpp

@@ -18,7 +18,7 @@
 
 #include "CTriggerThread.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 //< 500ms运行一次
@@ -106,7 +106,7 @@ bool CTriggerThread::suspendThread()
 
     //< 删除触发器
     {
-        std::vector<const iot_application::CTriggerPara *> vecTriggerPara;
+        std::vector<const iot_app::CTriggerPara *> vecTriggerPara;
         if (!getTriggerList(vecTriggerPara))
         {
             LOGERROR("suspendThread(): 获取已添加的触发器失败！");
@@ -151,7 +151,7 @@ void CTriggerThread::execute()
 }
 
 
-bool CTriggerThread::triggered(const iot_application::CTriggerPara *param, uint64 triggerTime)
+bool CTriggerThread::triggered(const iot_app::CTriggerPara *param, uint64 triggerTime)
 {
     STriggerEvent stEvent;
     stEvent.m_pPara = param;
@@ -178,10 +178,10 @@ void CTriggerThread::refreshCfg()
 
     //< 已添加的触发器map，便于查询
     boost::unordered::unordered_map
-        <std::string, const iot_application::CTriggerPara *>
+        <std::string, const iot_app::CTriggerPara *>
         mapAddedTrigger;
     {
-        std::vector<const iot_application::CTriggerPara *> vecTriggerPara;
+        std::vector<const iot_app::CTriggerPara *> vecTriggerPara;
         if (!getTriggerList(vecTriggerPara))
         {
             LOGERROR("suspendThread(): 获取已添加的触发器失败！");
@@ -190,8 +190,8 @@ void CTriggerThread::refreshCfg()
 
         for (size_t i = 0; i < vecTriggerPara.size(); ++i)
         {
-            const iot_application::CTriggerPara *pPara = vecTriggerPara[i];
-            if (iot_application::CTriggerPara::TRIGGER_TYPE_CONDITION
+            const iot_app::CTriggerPara *pPara = vecTriggerPara[i];
+            if (iot_app::CTriggerPara::TRIGGER_TYPE_CONDITION
                 != pPara->getTriggerType())
             {
                 //< 只允许条件触发器
@@ -231,9 +231,9 @@ void CTriggerThread::refreshCfg()
             if (mapAddedTrigger.end() == itAdded)
             {
                 //< 没找到，则添加
-                const iot_application::CTriggerPara *pTrigPrar =
-                    new iot_application::CTriggerPara(
-                    iot_application::CTriggerPara::TRIGGER_TYPE_CONDITION,
+                const iot_app::CTriggerPara *pTrigPrar =
+                    new iot_app::CTriggerPara(
+                    iot_app::CTriggerPara::TRIGGER_TYPE_CONDITION,
                     strTrigName);
 
                 if (addTrigger(pTrigPrar))
@@ -478,5 +478,5 @@ void CTriggerThread::handleTriggerEvent()
     iot_dbms::saveHisData(objDbInsert);
 }
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/CTriggerThread.h

@@ -19,12 +19,12 @@
 #include "rdb_api/CRdbAccess.h"
 #include "trigger_api/CTriggerApi.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class CTriggerThread
     : private iot_public::CTimerThreadBase,
-    iot_application::CTriggerApi
+    iot_app::CTriggerApi
 {
 public:
     CTriggerThread();
@@ -42,7 +42,7 @@ public:
 private:
     void execute()override;
 
-    bool triggered(const iot_application::CTriggerPara *param, uint64 triggerTime)override;
+    bool triggered(const iot_app::CTriggerPara *param, uint64 triggerTime)override;
 
     //< 从实时库刷新触发条件，以支持在线修改
     void refreshCfg();
@@ -53,7 +53,7 @@ private:
     //< 触发器事件结构
     struct STriggerEvent
     {
-        const iot_application::CTriggerPara *m_pPara;
+        const iot_app::CTriggerPara *m_pPara;
         uint64 m_nTime;
     };
 
@@ -74,5 +74,5 @@ private:
 
 };
 
-} //< namespace iot_application
+} //< namespace iot_app
 

product/src/application/fault_recall_srv/Main.cpp

@@ -12,8 +12,8 @@
 int main(int argc, char *argv[])
 {
     //< 控制单例生命周期
-    iot_application::CFaultRecallSrv::GC objSrvGc;
+    iot_app::CFaultRecallSrv::GC objSrvGc;
 
-    return iot_application::CFaultRecallSrv::getInstance().main(argc, argv);
+    return iot_app::CFaultRecallSrv::getInstance().main(argc, argv);
 }
 

product/src/application/fault_recall_srv/test/FrTest_JsonMsgClass/main.cpp

@@ -34,7 +34,7 @@ int main(/*int argc, char *argv[]*/)
     LOGINFO("Log system OK !");
 
     {
-        iot_application::CFrMsgNewSess objSrc, objDst;
+        iot_app::CFrMsgNewSess objSrc, objDst;
         objSrc.m_nDomainID = 11;
         objSrc.m_nTimeBegin = 12;
         objSrc.m_nTimeEnd = 13;
@@ -50,9 +50,9 @@ int main(/*int argc, char *argv[]*/)
     }
 
     {
-        iot_application::CFrMsgSessState objSrc, objDst;
+        iot_app::CFrMsgSessState objSrc, objDst;
         objSrc.m_nDomainID = 21;
-        objSrc.m_enState = iot_application::EN_FR_SS_PLAY;
+        objSrc.m_enState = iot_app::EN_FR_SS_PLAY;
         objSrc.m_strSess = "Test23";
 
         const std::string strJson = objSrc.toJsonStr();
@@ -65,7 +65,7 @@ int main(/*int argc, char *argv[]*/)
     }
 
     {
-        iot_application::CFrMsgGetSessState objSrc, objDst;
+        iot_app::CFrMsgGetSessState objSrc, objDst;
         objSrc.m_nDomainID = 31;
         objSrc.m_strSess = "Test32";
 
@@ -79,9 +79,9 @@ int main(/*int argc, char *argv[]*/)
     }
 
     {
-        iot_application::CFrMsgSetSessState objSrc, objDst;
+        iot_app::CFrMsgSetSessState objSrc, objDst;
         objSrc.m_nDomainID = 41;
-        objSrc.m_enState = iot_application::EN_FR_SS_PLAY;
+        objSrc.m_enState = iot_app::EN_FR_SS_PLAY;
         objSrc.m_strSess = "Test43";
 
         const std::string strJson = objSrc.toJsonStr();
@@ -94,7 +94,7 @@ int main(/*int argc, char *argv[]*/)
     }
 
     {
-        iot_application::CFrMsgSetTime objSrc, objDst;
+        iot_app::CFrMsgSetTime objSrc, objDst;
         objSrc.m_nDomainID = 51;
         objSrc.m_nTime = 52;
         objSrc.m_strSess = "Test53";

product/src/application/linkage_server/CModuleMbComm.cpp

@@ -11,7 +11,7 @@
 
 CModuleMbComm::CModuleMbComm(
     const iot_public::SRunAppInfo& appInfo)
-    :iot_application::CLinkageForServerApi(appInfo.nAppId),
+    :iot_app::CLinkageForServerApi(appInfo.nAppId),
     m_objActionAnalysis(appInfo, *this),
     m_objHmiMsgAnalysis(appInfo),
     m_nDomain(appInfo.nDomainId)
@@ -38,7 +38,7 @@ bool CModuleMbComm::sendStartHmiRequest(const CNodeLink& link)
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkStartRequest(*msg))
+    if (!iot_app::CLinkageForServerApi::linkStartRequest(*msg))
     {
         LOGINFO("发送半自动联动开始请求,失败, 联动[%s] 联动状态[%s]!",
             link.description().c_str(),
@@ -78,7 +78,7 @@ bool CModuleMbComm::nodeStatusToHmi(
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkStateChange(*msg))
+    if (!iot_app::CLinkageForServerApi::linkStateChange(*msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -106,7 +106,7 @@ bool CModuleMbComm::nodeStatusToHmi(const CNodeLink& link)
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkStateChange(*msg))
+    if (!iot_app::CLinkageForServerApi::linkStateChange(*msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -136,7 +136,7 @@ bool CModuleMbComm::nodeStatusToHmi(const CNodeFunc& fuc)
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkStateChange(*msg))
+    if (!iot_app::CLinkageForServerApi::linkStateChange(*msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -168,7 +168,7 @@ bool CModuleMbComm::nodeStatusToHmi(const CNodeAction& action)
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkStateChange(*msg))
+    if (!iot_app::CLinkageForServerApi::linkStateChange(*msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -199,7 +199,7 @@ bool CModuleMbComm::nodeAbnormalEndStatusToHmi(
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkStateChange(*msg))
+    if (!iot_app::CLinkageForServerApi::linkStateChange(*msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -230,7 +230,7 @@ bool CModuleMbComm::sendUiRequest(
         isSendToHost = false;
     }
 
-    if (!iot_application::CLinkageForServerApi::
+    if (!iot_app::CLinkageForServerApi::
         userInterveneRequest(*msg, isSendToHost))
     {
         LOGERROR("向HMI 发送 人工干预请求 动作: [%s]-[%s]-[%s] 失败!",
@@ -262,7 +262,7 @@ bool CModuleMbComm::linkOperateResponse(
         return false;
     }
 
-    if (!iot_application::CLinkageForServerApi::linkOperateResponse(*responseMsg))
+    if (!iot_app::CLinkageForServerApi::linkOperateResponse(*responseMsg))
     {
         LOGERROR("向HMI 发送 操作应答失败!");
         return false;

product/src/application/linkage_server/CModuleMbComm.h

@@ -20,7 +20,7 @@ class CRecoverNode;
 using namespace iot_idl::linkage;
 
 class CModuleMbComm :
-    public iot_application::CLinkageForServerApi
+    public iot_app::CLinkageForServerApi
 {
 public:
     CModuleMbComm(const iot_public::SRunAppInfo& appInfo);

product/src/application/linkage_server/CModuleTrigger.cpp

@@ -7,14 +7,14 @@
 #include "CModuleAlarmCreater.h"
 
 CModuleTrigger::CModuleTrigger(int appid)
-    : iot_application::CTriggerApi(appid)
+    : iot_app::CTriggerApi(appid)
 {
-    iot_application::CTriggerApi::start();
+    iot_app::CTriggerApi::start();
 }
 
 CModuleTrigger::~CModuleTrigger()
 {
-    iot_application::CTriggerApi::stop();
+    iot_app::CTriggerApi::stop();
     clearAll();
 }
 
@@ -31,7 +31,7 @@ void CModuleTrigger::addLinkTrigger(const CNodeLink& link)
 
 void CModuleTrigger::delLinkTrigger(const CNodeLink& link)
 {
-    using namespace iot_application;
+    using namespace iot_app;
 
     TriggerMap::iterator iter = m_mapTriggerParam.find(&link);
     if (iter != m_mapTriggerParam.end())
@@ -45,7 +45,7 @@ void CModuleTrigger::delLinkTrigger(const CNodeLink& link)
 
 void CModuleTrigger::clearAll()
 {
-    using namespace iot_application;
+    using namespace iot_app;
 
     TriggerMap::iterator iter = m_mapTriggerParam.begin();
     for (; iter != m_mapTriggerParam.end(); ++iter)
@@ -61,7 +61,7 @@ void CModuleTrigger::clearAll()
 CModuleTrigger::TriggerParaType*
 CModuleTrigger::findParam(const CNodeLink& link)
 {
-    using namespace iot_application;
+    using namespace iot_app;
 
     TriggerMap::iterator iter = m_mapTriggerParam.find(&link);
     if (iter != m_mapTriggerParam.end())
@@ -77,7 +77,7 @@ CModuleTrigger::createParam(const CNodeLink& link)
     //不触发的应该过滤掉
     BOOST_ASSERT(link.getTriggerExeType() != 0);
 
-    using namespace iot_application;
+    using namespace iot_app;
     std::string triggerName = link.getTriggerName();
     CTriggerPara::TRIGGER_TYPE type
         = (CTriggerPara::TRIGGER_TYPE)(link.getTriggerExeType() - 1);
@@ -99,7 +99,7 @@ CModuleTrigger::createParam(const CNodeLink& link)
 
 bool CModuleTrigger::isTrigged(const CNodeLink& link, uint64& triggerTime)
 {
-    iot_application::CTriggerPara* pParam
+    iot_app::CTriggerPara* pParam
         = findParam(link);
 
     if (!pParam)
@@ -107,14 +107,14 @@ bool CModuleTrigger::isTrigged(const CNodeLink& link, uint64& triggerTime)
         return false;
     }
 
-    return iot_application::CTriggerApi::isTrigged(
+    return iot_app::CTriggerApi::isTrigged(
         pParam,
         triggerTime);
 }
 
 bool CModuleTrigger::isTrigged()
 {
-    using namespace iot_application;
+    using namespace iot_app;
 
     TriggerMap::iterator iter = m_mapTriggerParam.begin();
     for (; iter!=m_mapTriggerParam.end(); ++iter)
@@ -176,11 +176,11 @@ void CModuleTrigger::ignoreBeforeTime(
     const CNodeLink& link,
     uint64 nTime)
 {
-    iot_application::CTriggerPara* pParam
+    iot_app::CTriggerPara* pParam
         = findParam(link);
     if (pParam)
     {
-        iot_application::CTriggerApi::ignoreBeforeTime(
+        iot_app::CTriggerApi::ignoreBeforeTime(
             pParam, nTime);
     }
 }

product/src/application/linkage_server/CModuleTrigger.h

@@ -10,12 +10,12 @@
 
 class CNodeLink;
 class CModuleAlarmCreater;
-class CModuleTrigger : iot_application::CTriggerApi
+class CModuleTrigger : iot_app::CTriggerApi
 {
 public:
-    typedef iot_application::CTriggerPara TriggerParaType;
+    typedef iot_app::CTriggerPara TriggerParaType;
     typedef std::map<const CNodeLink*,
-        iot_application::CTriggerPara*> TriggerMap;
+        iot_app::CTriggerPara*> TriggerMap;
 
     CModuleTrigger(int appid);
     ~CModuleTrigger();

product/src/application/linkage_server_api/CLinkageForHmiApi.cpp

@@ -1,7 +1,7 @@
 #include "application/linkage_server_api/CLinkageForHmiApi.h"
 #include "CLinkageForHmiApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CLinkageForHmiApi::CLinkageForHmiApi(int appid)
 {

product/src/application/linkage_server_api/CLinkageForHmiApiImpl.cpp

@@ -4,10 +4,10 @@
 
 #include "CLinkageForHmiApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::linkage;
 
-iot_application::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl(
+iot_app::CLinkageForHmiApiImpl::CLinkageForHmiApiImpl(
     int appid,
     CLinkageForHmiApi* api) :
     CTimerThreadBase("CLinkageForHmiApiImpl thread", 50),

product/src/application/linkage_server_api/CLinkageForHmiApiImpl.h

@@ -6,7 +6,7 @@
 #include "net/net_msg_bus_api/CMbCommunicator.h"
 #include "application/linkage_server_api/CLinkageForHmiApi.h"
 
-namespace iot_application {
+namespace iot_app {
     using namespace iot_idl::linkage;
 
     class CLinkageForHmiApiImpl

product/src/application/linkage_server_api/CLinkageForServerApi.cpp

@@ -2,7 +2,7 @@
 
 #include "CLinkageForServerApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::linkage;
 
 CLinkageForServerApi::CLinkageForServerApi(int appid)

product/src/application/linkage_server_api/CLinkageForServerApiImpl.cpp

@@ -5,7 +5,7 @@
 
 #include "CLinkageForServerApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::linkage;
 
 CLinkageForServerApiImpl::CLinkageForServerApiImpl(

product/src/application/linkage_server_api/CLinkageForServerApiImpl.h

@@ -7,7 +7,7 @@
 
 #include "application/linkage_server_api/CLinkageForServerApi.h"
 
-namespace iot_application
+namespace iot_app
 {
     using namespace iot_idl::linkage;
     class CLinkageForServerApiImpl

product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.cpp

@@ -9,7 +9,7 @@
 
 #include "QTtsEngineIflytek.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 QTtsEngineIflytek::QTtsEngineIflytek( const QVariantMap &mapPara, QObject *pParent ) :
@@ -193,4 +193,4 @@ void QTtsEngineIflytek::onNotSpeaking( int nStatusCode )
     }
 }
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsEngineIflytek.h

@@ -18,7 +18,7 @@
 
 #include "QTtsProcessorIflytek.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class QTtsEngineIflytek : public QTextToSpeechEngine
@@ -64,4 +64,4 @@ private:
     QMultiMap<QString, QVoice> m_mapVoices;
 };
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.cpp

@@ -10,7 +10,7 @@
 #include "QTtsPluginIflytek.h"
 #include "QTtsEngineIflytek.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 QTextToSpeechEngine *QTtsPluginIflytek::createTextToSpeechEngine(
@@ -25,4 +25,4 @@ QTextToSpeechEngine *QTtsPluginIflytek::createTextToSpeechEngine(
     return nullptr;
 }
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsPluginIflytek.h

@@ -15,7 +15,7 @@
 #include "qtexttospeechplugin.h"
 #include "qtexttospeechengine.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class QTtsPluginIflytek : public QObject, public QTextToSpeechPlugin
@@ -30,4 +30,4 @@ public:
                                                    QObject *pParent, QString *pStrError ) const override;
 };
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsProcessor.cpp

@@ -12,7 +12,7 @@
 
 #include "QTtsProcessor.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 QTtsProcessor::QTtsProcessor() :
@@ -275,4 +275,4 @@ void QTtsProcessor::audioStop( bool bAbort )
 }
 
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsProcessor.h

@@ -19,7 +19,7 @@
 
 #include "qvoice.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class QTtsProcessor : public QThread
@@ -92,4 +92,4 @@ private:
     QIODevice *m_pAudioBuffer;
 };
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.cpp

@@ -35,7 +35,7 @@
 #endif
 
 
-namespace iot_application
+namespace iot_app
 {
 
 QWeakPointer<QTtsProcessorIflytek> QTtsProcessorIflytek::m_ptrInstance;
@@ -295,4 +295,4 @@ void QTtsProcessorIflytek::deinit()
     m_vecVoices.clear();
 }
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/QTtsProcessorIflytek.h

@@ -19,7 +19,7 @@
 
 #include "QTtsProcessor.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 class QTtsProcessorIflytek : public QTtsProcessor
@@ -50,4 +50,4 @@ private:
     QVector<QString> m_vecSessParas;
 };
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/RegFunc.cpp

@@ -19,7 +19,7 @@
 
 #include "RegFunc.h"
 
-namespace iot_application
+namespace iot_app
 {
 
 //< 注意：私钥不能写在发布出去的代码中，不排除通过分析编译后的二进制文件可以获得
@@ -345,4 +345,4 @@ bool checkRegistration( const QString &strAppDirPath, QString &strAppId )
     return true;
 }
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/qtts_kbd_iflytek/RegFunc.h

@@ -11,7 +11,7 @@
 
 #include <QString>
 
-namespace iot_application
+namespace iot_app
 {
 
 /**********************************************************************************
@@ -24,4 +24,4 @@ namespace iot_application
 **********************************************************************************/
 bool checkRegistration( const QString &strAppDirPath, QString &strAppId );
 
-}  //< namespace iot_application
+}  //< namespace iot_app

product/src/application/sequence_server/CMbCommunicateInfo.cpp

@@ -9,7 +9,7 @@
 
 CMbCommunicateInfo::CMbCommunicateInfo(
     const iot_public::SRunAppInfo& appInfo)
-    :iot_application::CSeqForServerApi(appInfo.nAppId),
+    :iot_app::CSeqForServerApi(appInfo.nAppId),
     m_objActionAnalysis(appInfo),
     m_objHmiMsgAnalysis(appInfo),
     m_nDomain(appInfo.nDomainId)
@@ -28,7 +28,7 @@ bool CMbCommunicateInfo::sendActionToOpt(const CNodeAction& action)
     SOptCtrlRequest request;
     m_objActionAnalysis.ctreateSendMsg(request, action);
 
-    if (!iot_application::CSeqForServerApi::optCtrlRequest(request))
+    if (!iot_app::CSeqForServerApi::optCtrlRequest(request))
     {
         LOGERROR("发送OPT动作执行消息,失败!");
         return false;
@@ -52,7 +52,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(const CNodeSeq& seq)
     StatusChangeMessage msg
         = m_objHmiMsgAnalysis.ctreateStatusChangeMessage(seq);
 
-    if (!iot_application::CSeqForServerApi::seqStateChange(msg))
+    if (!iot_app::CSeqForServerApi::seqStateChange(msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -78,7 +78,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(const CNodeFunc& func)
     StatusChangeMessage msg
         = m_objHmiMsgAnalysis.ctreateStatusChangeMessage(func);
 
-    if (!iot_application::CSeqForServerApi::seqStateChange(msg))
+    if (!iot_app::CSeqForServerApi::seqStateChange(msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -106,7 +106,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(const CNodeAction& action)
     StatusChangeMessage msg
         = m_objHmiMsgAnalysis.ctreateStatusChangeMessage(action);
 
-    if (!iot_application::CSeqForServerApi::seqStateChange(msg))
+    if (!iot_app::CSeqForServerApi::seqStateChange(msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -138,7 +138,7 @@ bool CMbCommunicateInfo::nodeStatusToHmi(
             action,
             erroInfo);
 
-    if (!iot_application::CSeqForServerApi::seqStateChange(msg))
+    if (!iot_app::CSeqForServerApi::seqStateChange(msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -164,7 +164,7 @@ bool CMbCommunicateInfo::nodeAbnormalEndStatusToHmi(
     StatusChangeMessage msg
         = m_objHmiMsgAnalysis.ctreateFailedStatusChangeMessage(seq, erroInfo);
 
-    if (!iot_application::CSeqForServerApi::seqStateChange(msg))
+    if (!iot_app::CSeqForServerApi::seqStateChange(msg))
     {
         LOGERROR("发送状态变化,失败,%s!", log.c_str());
         return false;
@@ -182,7 +182,7 @@ bool CMbCommunicateInfo::sendUiRequest(
         = m_objHmiMsgAnalysis.ctreateUiRequestMessage(
             action, erroInfo);
 
-    if (!iot_application::CSeqForServerApi::userInterveneRequest(msg))
+    if (!iot_app::CSeqForServerApi::userInterveneRequest(msg))
     {
         LOGERROR("向HMI 发送 人工干预请求 动作: [%s]-[%s]-[%s] 失败!",
             action.getNodeSeq().description().c_str(),
@@ -208,7 +208,7 @@ bool CMbCommunicateInfo::seqOperateResponse(
         = m_objHmiMsgAnalysis.ctreateSeqOperateResponseMessage(
             pMsg, seq, erroInfo);
 
-    if (!iot_application::CSeqForServerApi::seqOperateResponse(responseMsg))
+    if (!iot_app::CSeqForServerApi::seqOperateResponse(responseMsg))
     {
         LOGERROR("向HMI 发送 操作应答失败!");
         return false;

product/src/application/sequence_server/CMbCommunicateInfo.h

@@ -20,7 +20,7 @@ class CRecoverNode;
 using namespace iot_idl::sequence;
 
 class CMbCommunicateInfo :
-    public iot_application::CSeqForServerApi
+    public iot_app::CSeqForServerApi
 {
 public:
     CMbCommunicateInfo(const iot_public::SRunAppInfo& appInfo);

product/src/application/sequence_server_api/CSeqForHmiApi.cpp

@@ -1,7 +1,7 @@
 #include "application/sequence_server_api/CSeqForHmiApi.h"
 #include "CSeqForHmiApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::sequence;
 CSeqForHmiApi::CSeqForHmiApi(int appid)
 {

product/src/application/sequence_server_api/CSeqForHmiApiImpl.cpp

@@ -4,9 +4,9 @@
 
 #include "CSeqForHmiApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::sequence;
-iot_application::CSeqForHmiApiImpl::CSeqForHmiApiImpl(
+iot_app::CSeqForHmiApiImpl::CSeqForHmiApiImpl(
     int appid,
     CSeqForHmiApi* api) :
     CTimerThreadBase("CSeqForHmiApiImpl thread", 50),

product/src/application/sequence_server_api/CSeqForHmiApiImpl.h

@@ -6,7 +6,7 @@
 #include "net/net_msg_bus_api/CMbCommunicator.h"
 #include "application/sequence_server_api/CSeqForHmiApi.h"
 
-namespace iot_application {
+namespace iot_app {
     using namespace iot_idl::sequence;
     class CSeqForHmiApiImpl
         : public iot_public::CTimerThreadBase

product/src/application/sequence_server_api/CSeqForServerApi.cpp

@@ -2,7 +2,7 @@
 
 #include "CSeqForServerApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::sequence;
 
 CSeqForServerApi::CSeqForServerApi(int appid)

product/src/application/sequence_server_api/CSeqForServerApiImpl.cpp

@@ -4,7 +4,7 @@
 #include "service/operate_server_api/JsonOptCommand.h"
 #include "CSeqForServerApiImpl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_idl::sequence;
 
 CSeqForServerApiImpl::CSeqForServerApiImpl(

product/src/application/sequence_server_api/CSeqForServerApiImpl.h

@@ -7,7 +7,7 @@
 
 #include "application/sequence_server_api/CSeqForServerApi.h"
 
-namespace iot_application {
+namespace iot_app {
     using namespace iot_idl::sequence;
 
     class CSeqForServerApiImpl

product/src/application/trigger_api/CDotNode.cpp

@@ -8,7 +8,7 @@
 #include "CDotNode.h"
 
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_service;
 
 CDotNode::CDotNode(const STableInfo& tableInfo)
@@ -93,7 +93,7 @@ void CDotNode::setValueEnable(bool isEnable)
     m_objDotInfo.dotValue.setValueEnable(isEnable);
 }
 
-bool iot_application::CDotNode::getValueEnable()
+bool iot_app::CDotNode::getValueEnable()
 {
     return  m_objDotInfo.dotValue.getValueEnable();
 }

product/src/application/trigger_api/CDotNode.h

@@ -10,7 +10,7 @@
 #include "CDotValue.h"
 #include "CQueryCtrl.h"
 
-namespace iot_application { 
+namespace iot_app { 
 
     class CDotNode :public CQueryCtrl
     {

product/src/application/trigger_api/CDotTableMngr.cpp

@@ -3,7 +3,7 @@
 #include "CDotTableMngr.h"
 #include "CTriggerNodeCondition.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CDotTableMngr::CDotTableMngr()
 {
@@ -18,7 +18,7 @@ CDotTableMngr::~CDotTableMngr()
     }
 }
 
-CDotNode* iot_application::CDotTableMngr::findNode(const std::string& tag)
+CDotNode* iot_app::CDotTableMngr::findNode(const std::string& tag)
 {
     std::map < std::string, CDotNode* >::iterator iter = m_mapDotTable.find(tag);
     if (iter != m_mapDotTable.end())
@@ -47,7 +47,7 @@ void CDotTableMngr::registerDot(DotValueMap& paramList)
     }
 }
 
-bool iot_application::CDotTableMngr::getDotValueList(
+bool iot_app::CDotTableMngr::getDotValueList(
     DotValueMap& paramList)
 {
     bool bRet = true;
@@ -80,7 +80,7 @@ bool iot_application::CDotTableMngr::getDotValueList(
     return bRet;
 }
 
-void iot_application::CDotTableMngr::resetDotTable()
+void iot_app::CDotTableMngr::resetDotTable()
 {
     boost::mutex::scoped_lock lock(m_muDot);
 
@@ -102,7 +102,7 @@ void iot_application::CDotTableMngr::resetDotTable()
     }
 }
 
-void iot_application::CDotTableMngr::resetDotTableLowToGeneral()
+void iot_app::CDotTableMngr::resetDotTableLowToGeneral()
 {
     boost::mutex::scoped_lock lock(m_muDot);
 
@@ -119,7 +119,7 @@ void iot_application::CDotTableMngr::resetDotTableLowToGeneral()
     }
 }
 
-void iot_application::CDotTableMngr::clearNode()
+void iot_app::CDotTableMngr::clearNode()
 {
     CDotNode* pNode;
     DotTableMap::iterator iter = m_mapDotTable.begin();

product/src/application/trigger_api/CDotTableMngr.h

@@ -16,7 +16,7 @@
 #include "CTagAnalysiser.h"
 
 
-namespace iot_application {
+namespace iot_app {
 
  
     typedef std::map <std::string, CDotNode*> DotTableMap;

product/src/application/trigger_api/CDotValue.cpp

@@ -1,6 +1,6 @@
 #include "CDotValue.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CDotValue::CDotValue() :
     m_bIsInit(true),m_nPntType(0),m_isEnable(false)
@@ -34,18 +34,18 @@ CDotValue::~CDotValue()
 {
 }
 
-iot_application::CDotValue::CDotValue(int type)
+iot_app::CDotValue::CDotValue(int type)
     : m_bIsInit(true),m_nPntType(type),m_isEnable(false)
 {
     this->m_objValue = 0;
 }
 
-bool iot_application::CDotValue::isInitValue() const
+bool iot_app::CDotValue::isInitValue() const
 {
     return m_bIsInit;
 }
 
-bool iot_application::CDotValue::getValue(DotValueType& value)
+bool iot_app::CDotValue::getValue(DotValueType& value)
 {
     if (m_bIsInit && !m_isEnable)
     {
@@ -55,7 +55,7 @@ bool iot_application::CDotValue::getValue(DotValueType& value)
     return true;
 }
 
-void iot_application::CDotValue::setValue(
+void iot_app::CDotValue::setValue(
     const DotValueType& value, bool isEnable)
 {
     m_objValue = value;
@@ -63,27 +63,27 @@ void iot_application::CDotValue::setValue(
     m_isEnable = isEnable;
 }
 
-void iot_application::CDotValue::setValueEnable(bool isEnable)
+void iot_app::CDotValue::setValueEnable(bool isEnable)
 {
     m_bIsInit = !isEnable;
 }
 
-bool iot_application::CDotValue::getValueEnable()
+bool iot_app::CDotValue::getValueEnable()
 {
     return m_isEnable;
 }
 
-void iot_application::CDotValue::setDotType(int type)
+void iot_app::CDotValue::setDotType(int type)
 {
     m_nPntType = type;
 }
 
-int iot_application::CDotValue::getDotType()
+int iot_app::CDotValue::getDotType()
 {
     return m_nPntType;
 }
 
-const DotValueType& iot_application::CDotValue::getValue()
+const DotValueType& iot_app::CDotValue::getValue()
 {
     return m_objValue;
 }

product/src/application/trigger_api/CDotValue.h

@@ -9,7 +9,7 @@
 #include "DataType.h"
 #include "pub_lua_engine_api/LuaEngineInterface.h"
 
-namespace iot_application {
+namespace iot_app {
 
     typedef iot_public::LuaVariantType  DotValueType;
 

product/src/application/trigger_api/CQueryCtrl.cpp

@@ -1,6 +1,6 @@
 #include "CQueryCtrl.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CQueryCtrl::CQueryCtrl() 
     : m_nTally(0),m_ePriority(QUERY_PRIORITY_HIGHT)

product/src/application/trigger_api/CQueryCtrl.h

@@ -4,7 +4,7 @@
 //查询控制
 #include "TriggerCommonDefine.h"
 
-namespace iot_application {
+namespace iot_app {
 
 
     //查询优先级

product/src/application/trigger_api/CRdbAccessMngr.cpp

@@ -3,7 +3,7 @@
 #include "CTriggerNodePeriod.h"
 #include "CTriggerNodeTimer.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CRdbAccessMngr::CRdbAccessMngr()
 {

product/src/application/trigger_api/CRdbAccessMngr.h

@@ -13,7 +13,7 @@
 
 #include "CTriggerNode.h"
 
-namespace iot_application {
+namespace iot_app {
 
     using namespace std;
     using namespace iot_dbms;

product/src/application/trigger_api/CRdbAccessMngrInterface.cpp

@@ -3,7 +3,7 @@
 #include "CTriggerNodePeriod.h"
 #include "CTriggerNodeTimer.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CRdbAccessMngrInterface::CRdbAccessMngrInterface()
 {

product/src/application/trigger_api/CRdbAccessMngrInterface.h

@@ -8,7 +8,7 @@
 
 #include "CTriggerNode.h"
 
-namespace iot_application {
+namespace iot_app {
 
     using namespace std;
     using namespace iot_dbms;

product/src/application/trigger_api/CRdbNetBase.cpp

@@ -1,6 +1,6 @@
 #include "CRdbNetBase.h"
 
-using namespace iot_application;
+using namespace iot_app;
 CRdbNetBase::CRdbNetBase()
 {
 

product/src/application/trigger_api/CRdbNetBase.h

@@ -3,7 +3,7 @@
 
 #include "rdb_net_api/CRdbNetApi.h"
 
-namespace iot_application {
+namespace iot_app {
 
     using namespace iot_dbms;
     class CRdbNetBase

product/src/application/trigger_api/CRdbNetInterface.cpp

@@ -1,5 +1,5 @@
 #include "CRdbNetInterface.h"
-using namespace iot_application;
+using namespace iot_app;
 
 CRdbNetInterface::CRdbNetInterface()
 {

product/src/application/trigger_api/CRdbNetInterface.h

@@ -1,7 +1,7 @@
 #ifndef CRDBNETINTERFACE_H
 #define CRDBNETINTERFACE_H
 #include "CRdbNetBase.h"
-namespace iot_application {
+namespace iot_app {
     class CRdbNetInterface : public CRdbNetBase
     {
     public:

product/src/application/trigger_api/CRdbNetMutex.cpp

@@ -1,6 +1,6 @@
 #include "CRdbNetMutex.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CRdbNetMutex::CRdbNetMutex(
     CRdbNetBase* api, const std::string& tablename)

product/src/application/trigger_api/CRdbNetMutex.h

@@ -3,7 +3,7 @@
 
 #include <string.h>
 #include "CRdbNetBase.h"
-namespace iot_application {
+namespace iot_app {
     //远程查询接口锁
     class CRdbNetMutex
     {

product/src/application/trigger_api/CRdbNetThread.cpp

@@ -4,7 +4,7 @@
 #include "CRdbNetInterface.h"
 #include "pub_utility_api/TimeUtil.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CRdbNetThread::CRdbNetThread(
     CDotTableMngr& dotTable,

product/src/application/trigger_api/CRdbNetThread.h

@@ -8,7 +8,7 @@
 #include "CDotTableMngr.h"
 #include "service/data_process_api/DataProcessApi.h"
 
-namespace iot_application {
+namespace iot_app {
 
     using namespace iot_dbms;
     using namespace iot_service;

product/src/application/trigger_api/CTagAnalysiser.cpp

@@ -5,7 +5,7 @@
 #include "CTagAnalysiser.h"
 #include "service/data_process_api/DataProcessApi.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace iot_service;
 
 CTagAnalysiser::CTagAnalysiser()

product/src/application/trigger_api/CTagAnalysiser.h

@@ -6,7 +6,7 @@
 #include "TriggerCommonDefine.h"
 #include "pub_sysinfo_api/SysInfoApi.h"
 
-namespace iot_application {
+namespace iot_app {
     class CTagAnalysiser
     {
     public:

product/src/application/trigger_api/CTestRdbAccessMngr.cpp

@@ -1,7 +1,7 @@
 #include "boost/core/ignore_unused.hpp"
 #include "CTestRdbAccessMngr.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTestRdbAccessMngr::CTestRdbAccessMngr()
 {

product/src/application/trigger_api/CTestRdbAccessMngr.h

@@ -5,7 +5,7 @@
 
 #include "CRdbAccessMngr.h"
 
-namespace iot_application {
+namespace iot_app {
 
     using namespace std;
 

product/src/application/trigger_api/CTestRdbNet.cpp

@@ -1,7 +1,7 @@
 #include "boost/core/ignore_unused.hpp"
 #include "CTestRdbNet.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTestRdbNet::CTestRdbNet()
 {

product/src/application/trigger_api/CTestRdbNet.h

@@ -3,7 +3,7 @@
 
 #include "CRdbNetBase.h"
 
-namespace iot_application {
+namespace iot_app {
     class CTestRdbNet : public CRdbNetBase
     {
     public:

product/src/application/trigger_api/CTriggerApi.cpp

@@ -5,7 +5,7 @@
 #include "CTestRdbAccessMngr.h"
 #include "CTestRdbNet.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTriggerApi::CTriggerApi(int appid)
 {

product/src/application/trigger_api/CTriggerApiImpl.cpp

@@ -5,7 +5,7 @@
 #include "CTriggerNodeFactory.h"
 #include "CRdbAccessMngrInterface.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTriggerApiImpl::CTriggerApiImpl(const STriggerInitParam& param)
     :CTimerThreadBase("CTriggerApiImpl thread", 500),

product/src/application/trigger_api/CTriggerApiImpl.h

@@ -15,7 +15,7 @@
 #include "CDotTableMngr.h"
 #include "CRdbNetThread.h"
 
-namespace iot_application {
+namespace iot_app {
 
     struct STriggerInitParam
     {

product/src/application/trigger_api/CTriggerNode.cpp

@@ -3,7 +3,7 @@
 #include "CTriggerNode.h"
 #include "CRdbAccessMngr.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTriggerNode::CTriggerNode(const CTriggerPara* param)
     :m_ptrParam(param),
@@ -31,7 +31,7 @@ uint64 CTriggerNode::getLastTgRealExeTime(uint64 curExeTime, uint64 curElapseTim
     return curExeTime - (curElapseTime - m_nLastTgElapseTime);
 }
 
-uint64 iot_application::CTriggerNode::getLastTgExeTime()
+uint64 iot_app::CTriggerNode::getLastTgExeTime()
 {
     return m_nLastExeTime;
 }

product/src/application/trigger_api/CTriggerNode.h

@@ -9,7 +9,7 @@
 
 #include "application/trigger_api/CTriggerPara.h"
 
-namespace iot_application
+namespace iot_app
 {
     class CRdbAccessMngr;
     class CTriggerNode

product/src/application/trigger_api/CTriggerNodeCondition.cpp

@@ -5,7 +5,7 @@
 #include "CRdbAccessMngr.h"
 #include "CDotTableMngr.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTriggerNodeCondition::CTriggerNodeCondition(
     const CTriggerPara* param,
@@ -36,7 +36,7 @@ bool CTriggerNodeCondition::initConfig(CRdbAccessMngr* access)
     return true;
 }
 
-bool iot_application::CTriggerNodeCondition::checkTrigger(uint64 exeTime)
+bool iot_app::CTriggerNodeCondition::checkTrigger(uint64 exeTime)
 {
     //值如果没有完全赋值,则不触发
     BOOST_ASSERT(m_ptrDotTable);

product/src/application/trigger_api/CTriggerNodeCondition.h

@@ -12,7 +12,7 @@
 #include "CDotValue.h"
 #include "CDotTableMngr.h"
 
-namespace iot_application
+namespace iot_app
 {
     class CRdbAccessMngr;
     class CDotTableMngr;

product/src/application/trigger_api/CTriggerNodeFactory.cpp

@@ -5,7 +5,7 @@
 #include "CTriggerNodePeriod.h"
 #include "CTriggerNodeCondition.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTriggerNodeFactory::CTriggerNodeFactory()
 {

product/src/application/trigger_api/CTriggerNodeFactory.h

@@ -7,7 +7,7 @@
 #include "CTriggerNode.h"
 #include "application/trigger_api/CTriggerPara.h"
 
-namespace iot_application {
+namespace iot_app {
     class CDotTableMngr;
     class CTriggerNodeFactory
     {

product/src/application/trigger_api/CTriggerNodePeriod.cpp

@@ -6,7 +6,7 @@
 #include "CTriggerNodePeriod.h"
 #include "CRdbAccessMngr.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
 CTriggerNodePeriod::CTriggerNodePeriod(const CTriggerPara* param)
     :CTriggerNode(param)
@@ -17,7 +17,7 @@ CTriggerNodePeriod::~CTriggerNodePeriod()
 {
 }
 
-bool iot_application::CTriggerNodePeriod::initConfig(CRdbAccessMngr* access)
+bool iot_app::CTriggerNodePeriod::initConfig(CRdbAccessMngr* access)
 {
     if (!access->queryPeriodConfig(
         m_objDefine,
@@ -45,7 +45,7 @@ bool iot_application::CTriggerNodePeriod::initConfig(CRdbAccessMngr* access)
     return true;
 }
 
-bool iot_application::CTriggerNodePeriod::checkTrigger(uint64 exeTime)
+bool iot_app::CTriggerNodePeriod::checkTrigger(uint64 exeTime)
 {
     if (!timeLimit(exeTime))
     {

product/src/application/trigger_api/CTriggerNodePeriod.h

@@ -8,7 +8,7 @@
 #include "CTriggerNode.h"
 
 
-namespace iot_application {
+namespace iot_app {
     class CRdbAccessMngr;
 
     class CTriggerNodePeriod : public CTriggerNode

product/src/application/trigger_api/CTriggerNodeTimer.cpp

@@ -1,9 +1,9 @@
 #include "CTriggerNodeTimer.h"
 #include "CRdbAccessMngr.h"
 
-using namespace iot_application;
+using namespace iot_app;
 
-CTriggerNodeTimer::CTriggerNodeTimer(const iot_application::CTriggerPara* param)
+CTriggerNodeTimer::CTriggerNodeTimer(const iot_app::CTriggerPara* param)
     :CTriggerNode(param)
 {
 }
@@ -19,7 +19,7 @@ bool CTriggerNodeTimer::initConfig(CRdbAccessMngr* access)
         getTriggerName());
 }
 
-bool iot_application::CTriggerNodeTimer::checkTrigger(uint64 exeTime)
+bool iot_app::CTriggerNodeTimer::checkTrigger(uint64 exeTime)
 {
     if (exeTime == m_objDefine.trigger_time)
     {

product/src/application/trigger_api/CTriggerNodeTimer.h

@@ -7,7 +7,7 @@
 #include "TriggerCommonDefine.h"
 #include "CTriggerNode.h"
 
-namespace iot_application {
+namespace iot_app {
     class CRdbAccessMngr;
     class CTriggerNodeTimer :public CTriggerNode
     {

product/src/application/trigger_api/CTriggerPara.cpp

@@ -1,6 +1,6 @@
 #include "application/trigger_api/CTriggerPara.h"
 
-using namespace iot_application;
+using namespace iot_app;
 using namespace std;
 
 CTriggerPara::CTriggerPara(

product/src/application/trigger_api/TriggerCommonDefine.h

@@ -6,7 +6,7 @@
 #include "DataType.h"
 
 
-namespace iot_application {
+namespace iot_app {
 
     using namespace std;
 

product/src/application/video_server/VideoCameraTable.h

@@ -3,7 +3,7 @@
 #include <string>
 #include "string.h"
 
-namespace iot_application
+namespace iot_app
 {
     const std::string CN_TN_CCTVCameraInfo = "cctv_camera_info";
     const std::string CAMERA_TAG_NAME = "tag_name";
@@ -44,5 +44,5 @@ namespace iot_application
             nCameraPort = -1;
         }
     }STableCameraInfo,*PSTableCameraInfo;
-}  //namespace iot_application
+}  //namespace iot_app
 #endif // VIDEOCAMERATABLE_H

product/src/application/video_server/VideoCommon.h

@@ -3,7 +3,7 @@
 
 #include "common/DataType.h"
 #include "string"
-namespace iot_application
+namespace iot_app
 {
     const std::string CN_ProcName_VideoServer="video_server";//当前进程名
     const std::string Rtu_Name = "##$$video_server$$##";

product/src/application/video_server/VideoMsgBusMng.cpp

@@ -6,7 +6,7 @@
 using namespace std;
 using namespace iot_public;
 using namespace iot_net;
-using namespace iot_application;
+using namespace iot_app;
 
 VideoMsgBusMng::VideoMsgBusMng(const iot_public::SRunAppInfo &stRunAppInfo)
     :m_stRunAppInfo(stRunAppInfo)

product/src/application/video_server/VideoMsgBusMng.h

@@ -5,7 +5,7 @@
 #include "net_msg_bus_api/CMbCommunicator.h"
 #include "common/MessageChannel.h"
 
-namespace iot_application
+namespace iot_app
 {
 class VideoMsgBusMng
 {