#IQRV #comment [Module] 放开日志上传功能

ChangeLog

@@ -1,4 +1,5 @@
 ## 更新记录
+* 将依赖库的声明语句（Conan）全部迁移到 addin/cmake/DepencyConanFiles.cmake （廖桂发，何粤超，2021年5月10日）
 * 更新Module Other Tool 文件夹内容为 utf8，更新UOS的root.ini为UTF8，更新 DevAdapter/cmbsz 为utf8
 
 * 支持rvc/Audio的拷贝和打包（廖桂发，2020年12月30日）

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -1376,8 +1376,8 @@ void ResourceWatcherFSM::CleanMoreVideoFiles()
         if (nRes - reseved == 0) {
             Dbg("There are no any video files in facts.");
             //SetSysValAndBroadcast(0, "There are no any video files in facts.");
-            //LeaveCriticalSection(&g_csVideoMoreClear);
-            //return;
+            LeaveCriticalSection(&g_csVideoMoreClear);
+            return;
         }
     }
 
@@ -1424,7 +1424,6 @@ void ResourceWatcherFSM::CleanMoreVideoFiles()
 		unsigned long long uiAdjustment(0);
         if (diskInfo.IsNeedToDoClearJobEx((LPCTSTR)m_uploadedVideoDirPath, uiSpaceRequired, uiAdjustment, &uiMoreSpaceRealRequired) 
             && uiMoreSpaceRealRequired) {
-
             unsigned long long uiNewFreeBytes(0);
             UINT uDeletedCnt = 0, uFailedDeleteCnt = 0;
             BOOL bTrackBackStop = FALSE;

Module/mod_upload/CMakeLists.txt

@@ -35,7 +35,7 @@ set(${MODULE_PREFIX}_SRCS
 endif(WIN32)
 
 #设置版本
-set(MOD_VERSION_STRING "1.0.1-dev3")
+set(MOD_VERSION_STRING "1.0.1-dev4")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 

Module/mod_upload/UploadFSM.cpp

@@ -41,9 +41,7 @@ void UploadFSM::OnSysVarEvent( const char *pszKey, const char *pszValue,const ch
 {
 	Dbg("rx sysvar %s from %s, %s to %s", pszKey, pszEntityName, pszOldValue, pszValue);
 	if (pszValue[0] == 'O') {
-        //PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
-        LogWarn(Severity_High, Error_NotSupport, 0, "方便查日志，一轮测试期间还是不做任何上传操作！");
-        PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
+        PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
 	} else {
 		PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
 	}
@@ -165,9 +163,7 @@ void UploadFSM::s0_on_entry()
 	ErrorCodeEnum Error = m_pEntity->GetFunction()->GetSysVar("CallState", strValue);
 	if (Error == Error_Succeed) {
 		if (strValue[0] == 'O') { // only upload when CallState in offline state
-        //PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
-            LogWarn(Severity_High, Error_NotSupport, 0, "方便查日志，一轮测试期间还是不做任何上传操作！");
-            PostEventFIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
+			PostEventFIFO(new FSMEvent(USER_EVT_JMP_ENABLE));
 		} else {
 			PostEventLIFO(new FSMEvent(USER_EVT_JMP_DISABLE));
 		}