!10475 vx93

Merge pull request !10475 from 80374374/ST2

DevAdapter/CMakeLists.txt

@@ -278,7 +278,8 @@ if(DEVADAPTER_USING_CONAN)
             set(GWI_CONAN_ALL_LIB_NAME gwi/2024.0723.20@LR04.02_VendorLib/stable)
             #Fw: 回复：回复: Fw: 回复：回复: Fw: 南天-缺陷案例解决方案及适配器整合
             set(NANTIAN_CONAN_ALL_LIB_NAME nantian/2024.0802.2@LR04.02_VendorLib/stable)
-            set(GRG_CONAN_ALL_LIB_NAME grg/2023.1213.24@LR04.02_VendorLib/stable)
+            #Fw: 单屏VTM最新版本链接
+            set(GRG_CONAN_ALL_LIB_NAME grg/2024.0913.45@LR04.02_VendorLib/stable)
             rvc_aggerate_vendor_libs(keba)
             rvc_aggerate_vendor_libs(cw)
             rvc_aggerate_vendor_libs(szzt)

Module/mod_chromium/CModTools.cpp

@@ -261,6 +261,8 @@ namespace Chromium {
         this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
         cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append(errType._to_string());
 		errPageUrl.Append(" --cache-path=").Append(cachePath);
+        if (g_useMagic)
+			errPageUrl.Append(" --magic-str=").Append(m_magicStr.c_str());
 		if (g_withMedia)
 			errPageUrl.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
@@ -480,6 +482,8 @@ namespace Chromium {
         this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
         cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append((+ERR_PAGE_REASON::Ad)._to_string());
         strCmdLine.Append(" --cache-path=").Append(cachePath);
+        if (g_useMagic)
+            strCmdLine.Append(" --magic-str=").Append(m_magicStr.c_str());
 		if (g_withMedia)
 			strCmdLine.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
@@ -488,6 +492,7 @@ namespace Chromium {
 			strCmdLine.Append(" --adapt-sogou=").Append(std::to_string(g_sogouForce).c_str());
         strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver");
         strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::Ad)._to_string());
+        strCmdLine.Append(" --top=-1");
         strCmdLine.Append(" --run-extend");
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("cmdline : %s", strCmdLine.GetData());
         return strCmdLine.GetData();
@@ -509,7 +514,9 @@ namespace Chromium {
             .Append(isExtend ? (+ERR_PAGE_REASON::extend)._to_string() : (+ERR_PAGE_REASON::main)._to_string());
         //strCmdLine.Append(" --hide-controls=true")
         strCmdLine.Append(" --cache-path=").Append(cachePath);
-        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver");
+        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver --hide-tabs");
+		if (g_useMagic)
+            strCmdLine.Append(" --magic-str=").Append(m_magicStr.c_str());
 		if (g_withMedia)
 			strCmdLine.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
@@ -548,7 +555,7 @@ namespace Chromium {
 		this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
 		cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append((+ERR_PAGE_REASON::Ad)._to_string());
 		strCmdLine.Append(" --cache-path=").Append(cachePath);
-		strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver");
+		strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver --hide-tabs");
 		strCmdLine.Append(" --lang=zh-CN");//install page need language chinese
 		strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::Install)._to_string());
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("cmdline : %s", strCmdLine.GetData());
@@ -654,18 +661,19 @@ namespace Chromium {
 		CSimpleStringA strChromiumPath = GetCefHead(this->m_pEntity), strCmdLine = "";
 		strCmdLine.Append(strChromiumPath).Append(" --url=").Append(url.c_str());
 		if (width > 0 && height > 0)
-			strCmdLine.Append(" --window-size=").Append(std::to_string(width).c_str()).Append(",").Append(std::to_string(height).c_str());
+			strCmdLine.Append(" --center-size=").Append(std::to_string(width).c_str()).Append("*").Append(std::to_string(height).c_str());
 		if (point_x != -1 && point_y != -1)
 		{
-			strCmdLine.Append(" --window-position=").Append(std::to_string(point_x).c_str()).Append(",").Append(std::to_string(point_y).c_str());
+			strCmdLine.Append(" --src-pos=").Append(std::to_string(point_x).c_str()).Append("*").Append(std::to_string(point_y).c_str());
 		}
 		CSimpleStringA cachePath;
 		this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
 		cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append(name.c_str());
 		strCmdLine.Append(" --cache-path=").Append(cachePath);
-		strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver --bring-top");
+		strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver --hide-tabs");
 		strCmdLine.Append(" --lang=zh-CN");//install page need language chinese
 		strCmdLine.Append(" --logextend=").Append(name.c_str());
+		strCmdLine.Append(" --top=").Append(std::to_string(top).c_str());
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s cmdline : %s", name.c_str(), strCmdLine.GetData());
 		return strCmdLine.GetData();
 #endif
@@ -682,7 +690,9 @@ namespace Chromium {
         cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append(m_specialPage_temp_name.c_str());
         //strCmdLine.Append(" --hide-controls=true")
         strCmdLine.Append(" --cache-path=").Append(cachePath);
-        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver");;//don't use single-process, it will affect the cef log
+        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame  --winhttp-proxy-resolver  --hide-tabs");;//don't use single-process, it will affect the cef log
+        if (g_useMagic)
+            strCmdLine.Append(" --magic-str=").Append(m_magicStr.c_str());
 		if (g_withMedia)
 			strCmdLine.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
@@ -691,9 +701,10 @@ namespace Chromium {
 			strCmdLine.Append(" --adapt-sogou=").Append(std::to_string(g_sogouForce).c_str());
         strCmdLine.Append(" --logextend=").Append(m_specialPage_temp_name.c_str());
         if (m_specialPage_temp_size.length() > 0)
-            strCmdLine.Append(" --window-size=").Append(m_specialPage_temp_size.c_str());
+            strCmdLine.Append(" --center-size=").Append(m_specialPage_temp_size.c_str());
         if (m_specialPage_temp_point.length() > 0)
-            strCmdLine.Append(" --window-positio=").Append(m_specialPage_temp_point.c_str());
+            strCmdLine.Append(" --src-pos=").Append(m_specialPage_temp_point.c_str());
+        strCmdLine.Append(" --top=").Append(std::to_string((unsigned long long)m_specialPage_temp_top).c_str());
         strCmdLine.Append(" --errurl=file:\/\/\/").Append(getErrUrl(ERR_PAGE_REASON::main).second.c_str());
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("cmdline : %s", strCmdLine.GetData());
         return strCmdLine.GetData();

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1332,8 +1332,8 @@ bool CHealthManagerEntity::StartManagerDesktopPage(CSimpleStringA pageName)
 		req.mainUrl = statusPagePath;
 		req.type = "SpecialPageFromOtherEntity";
 		req.name = "tempMessage";
-		req.param1 = CSimpleStringA::Format("%d,%d", width, height);
-		req.param2 = CSimpleStringA::Format("0,0");
+		req.param1 = CSimpleStringA::Format("%d*%d", width, height);
+		req.param2 = CSimpleStringA::Format("0*0");
 		req.top = -1;
 
 		error = (*chromiumClient)(EntityResource::getLink().upgradeLink())->OpenBrowser(req, ans, 10000);

addin/cmake/DependencyConanFiles.cmake

@@ -69,7 +69,7 @@ if(MSVC)
 			#mod_chromium
 			CEFControl/1.0@LR04.02_ThirdParty/testing
 			#mod_chromium
-			cefclient_mutable/2.0.47@LR04.02_ThirdParty/testing
+			cefclient_mutable/2.0.37@LR04.02_ThirdParty/testing
 			#libaudiorender
 			speex/1.2.1@LR04.02_ThirdParty/testing
 			#libvideoframework
@@ -80,7 +80,7 @@ if(MSVC)
 			Misc/2024.0313.1@LR04.02_ThirdParty/msvc
 			)
 			
-	list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/2.0.41@LR04.02_ThirdParty/testing)
+	list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/1.1@LR04.02_ThirdParty/testing)
 	list(APPEND CONAN_CURPLATFORM_LIB_NAMES RuntimeBase/2024.0401.02@LR04.02_ThirdParty/testing)
 else()
 	set(CONAN_CURPLATFORM_LIB_NAMES