Merge branch 'ST2' of http://gitee.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into ST2

Module/include/DevFSMCommBase.hpp

@@ -583,16 +583,10 @@ struct AdapterInfo : public AdaptorInfo
 							continue;
 						}
 
-						if (strnicmp((LPCTSTR)arr2[0], "CM", strlen("CM")) == 0 || strnicmp((LPCTSTR)arr2[0], "PM", strlen("PM")) == 0)
-						{
-							string strData = arr2[1].GetData();
-							regex pattern("V1.0|V2.0");
-							smatch sm;
-							if (!regex_match(strData, sm, pattern))
-								DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckDevInfoFormat, Wrong format of %s:%s", arr2[0].GetData(), arr2[1].GetData());
-						}
-						else if (strnicmp((LPCTSTR)arr2[0], "PID", strlen("PID")) == 0 || strnicmp((LPCTSTR)arr2[0], "MID", strlen("MID")) == 0
-							|| strnicmp((LPCTSTR)arr2[0], "FWID", strlen("FWID")) == 0 || strnicmp((LPCTSTR)arr2[0], "CID", strlen("CID")) == 0)
+						if ((strnicmp((LPCTSTR)arr2[0], "MID", strlen("MID")) == 0 && arr2[1].Compare("1.0") != 0)
+							|| (strnicmp((LPCTSTR)arr2[0], "CODE", strlen("CODE")) == 0 && arr2[1].Compare("UCS2") != 0))
+							DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckDevInfoFormat, Wrong format of %s:%s", arr2[0].GetData(), arr2[1].GetData());
+						else if (strnicmp((LPCTSTR)arr2[0], "PID", strlen("PID")) == 0 || strnicmp((LPCTSTR)arr2[0], "FWID", strlen("FWID")) == 0)
 						{
 							string strData = arr2[1].GetData();
 							regex pattern(".{8,16}");
@@ -608,10 +602,10 @@ struct AdapterInfo : public AdaptorInfo
 							if (!regex_match(strData, sm, pattern))
 								DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckDevInfoFormat, Wrong format of %s:%s", arr2[0].GetData(), arr2[1].GetData());
 						}
-						else if (strnicmp((LPCTSTR)arr2[0], "CODE", strlen("CODE")) == 0)
+						else if (strnicmp((LPCTSTR)arr2[0], "RF", strlen("RF")) == 0)
 						{
 							string strData = arr2[1].GetData();
-							regex pattern("UCS2");
+							regex pattern("Y|N");
 							smatch sm;
 							if (!regex_match(strData, sm, pattern))
 								DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("CheckDevInfoFormat, Wrong format of %s:%s", arr2[0].GetData(), arr2[1].GetData());

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -2993,8 +2993,7 @@ void ResourceWatcherFSM::GetSystemCPUStatus()
     CloseHandle(hProcessSnapOld);
     
     // 等待一段时间
-    Sleep(100); // 100毫秒
-    ULONGLONG deltaTime = 100 * 1000000; // 100毫秒转换为纳秒
+    Sleep(1000); // 1000毫秒
 
     FILETIME idleTime;
     FILETIME kernelTime;
@@ -3056,7 +3055,7 @@ void ResourceWatcherFSM::GetSystemCPUStatus()
         }
 
         // 转换为百分比
-        double tRatio = 100.0 * (newProcessTime[tPid] - oldProcessTime[tPid]) / deltaTime;
+        double tRatio = 100.0 * (newProcessTime[tPid] - oldProcessTime[tPid]) / (kernel + user);
         if (tRatio > 0.0);
         {
             processCpu[tPid] = tRatio;

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1459,7 +1459,10 @@ void CHealthManagerEntity::OnEntityStateHook(const char* pszEntityName, const ch
 		case EntityState_Idle:
 		{
 			if (_strnicmp("Chromium", pszEntityName, strlen("Chromium")) == 0)
+			{
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR0402501Z002")("Chromium to idle.");
 				LogEvent(Severity_Middle, LOG_EVT_HEALTHMANAGER_BROWSER_IDLE, "Chromium to idle.");
+			}
 		}
 		default:
 			break;