#IQBX #comment fix: be consistent with windows

CMakeLists.txt

@@ -284,7 +284,7 @@ if(CONAN_CACHE_CLEAR)
 	conan_local_remove()
 endif(CONAN_CACHE_CLEAR)
 
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.89@LR04.02_FrameworkLib/dev
+conan_cmake_run(REQUIRES RvcFramework/1.2.0.90@LR04.02_FrameworkLib/dev
 	Audio/2023.0509.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 

Module/mod_chromium/CModTools.cpp

@@ -777,6 +777,9 @@ namespace Chromium {
 					CSimpleString::Format("install page check err, can not connect to %s or %s", installUrls[0].c_str(), installUrls[1].c_str()).GetData());
 			}
 			std::string dstInstallUrl = checkRet.first ? checkRet.second : installUrls[0];
+			CSimpleString runningVer = "";
+			m_pEntity->GetFunction()->GetRunningVersion(runningVer);
+			dstInstallUrl.append("?version=").append(runningVer.GetData());
 			auto strCmdLine = generateInstallCmd(dstInstallUrl);
 			auto openCefRet = openCef(strCmdLine, false);
 			if (Error_Succeed == openCefRet.first)

Module/mod_chromium/CWebsocketServer.cpp

@@ -269,7 +269,7 @@ namespace Chromium {
 
 
 			auto logType = json_deal::getStringFromCjsonObj(pJson.get(), msg_logType);//it can be equal to Sys/User
-			LOG_TYPE_E t_type = (logType.second.Compare("User", true) == 0) ? LOG_TYPE_BUSINESS_USER : LOG_TYPE_BUSINESS_SYSTEM;
+			LOG_TYPE_E t_type = (logType.second.Compare("User", true) == 0) ? LOG_TYPE_USER : LOG_TYPE_SYSTEM;
 
 			//通过变量方式进行处理
 			DbgWithLink t_obj(changeMessageTypeToLogLevel(messageType), t_type);

Module/mod_chromium/mod_chromium.h

@@ -35,14 +35,12 @@
 
 
 #pragma once
-namespace Chromium
-{
+namespace Chromium {
 
-#define BROWSER_TIMER_ID 0xF002
-#define BROWSER_TIMER_INTERVAL 3600000
+	#define BROWSER_TIMER_ID 0xF002
+	#define BROWSER_TIMER_INTERVAL 3600000
 
-	typedef struct
-	{
+	typedef struct {
 		std::string key;
 		std::string value;
 		std::string oldValue;
@@ -136,7 +134,7 @@ namespace Chromium
 		int getBrowserStartTimes();
 	private:
 		//subscribe
-		CUUID m_uidCameraListener, m_uuidAccessAuth, m_uuidResourceWatch, m_uidBrowserListenser, m_uuidAccessAuthErr, m_uuidAllFault, m_uuidVTMLoader;
+		CUUID m_uidCameraListener, m_uuidAccessAuth, m_uuidResourceWatch,m_uidBrowserListenser, m_uuidAccessAuthErr, m_uuidAllFault, m_uuidVTMLoader;
 		virtual void OnLog(const CAutoArray<CUUID>& SubIDs, const CUUID nLogID, const LogTypeEnum eLogType, const SeverityLevelEnum eLevel,
 			const DWORD dwSysError, const DWORD dwUserCode, const DWORD dwEntityInstanceID, const WORD wEntityDevelID,
 			const CAutoArray<DWORD>& Param, const char* pszEntityName, const char* pszModuleName, const char* pszMessage, const linkContext& pLinkInfo);