feat: upgrade nertc to 5.9.15

Signed-off-by: Dylan <2894220@gmail.com>

Author: nmgwddj

.cmake/conan.cmake

@@ -57,6 +57,8 @@ function(_get_msvc_ide_version result)
         set(${result} 16 PARENT_SCOPE)
     elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1950)
         set(${result} 17 PARENT_SCOPE)
+	elseif(NOT MSVC_VERSION VERSION_LESS 1950 AND MSVC_VERSION VERSION_LESS 1960)
+        set(${result} 18 PARENT_SCOPE)
     else()
         message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")
     endif()

.cmake/export_recipes.cmake

@@ -129,7 +129,7 @@ function(export_recipes_dynamically)
         "sqlite3/3.51.0@yunxin/stable"
         "tinyxml/2.6.2@yunxin/stable"
         "nim/10.9.72-beta.0@yunxin/stable"
-        "nertc/4.1.1@yunxin/stable"
+        "nertc/5.9.15@yunxin/stable"
         "libcef/3.2623.1401@yunxin/stable"
         "ne_live_player/1.6.9@yunxin/stable"
         "image_ole/4.2.0@yunxin/stable"

conanfile.py

@@ -32,7 +32,7 @@ def requirements(self):
         self.requires("sqlite3/3.51.0@yunxin/stable")
         self.requires("tinyxml/2.6.2@yunxin/stable")
         self.requires("nim/10.9.72-beta.0@yunxin/stable")
-        self.requires("nertc/4.1.1@yunxin/stable")
+        self.requires("nertc/5.9.15@yunxin/stable")
         self.requires("libcef/3.2623.1401@yunxin/stable")
         self.requires("ne_live_player/1.6.9@yunxin/stable")
         self.requires("image_ole/4.2.0@yunxin/stable")

recipes/nertc/all/conandata.yml

@@ -31,3 +31,11 @@ sources:
       x86_64:
         url: "https://yx-web-nosdn.netease.im/package/1679992232/NERTC_MacOS_SDK_V4.6.50.zip"
         sha256: "e81961ad042c5dcf36722e7c16b6f449ffcdadd951fb03333266f729bea65ee2"
+  "5.9.15":
+    Windows:
+      x86_64:
+        url: "https://yx-web-nosdn.netease.im/package/1766136551/NERTC_Windows_SDK_V5.9.15.zip"
+        sha256: "28419e38311115c935ee2c117206eccbcf84a8bd16febc8a50d0f4ab66eb6aa8"
+      x86:
+        url: "https://yx-web-nosdn.netease.im/package/1766136551/NERTC_Windows_SDK_V5.9.15.zip"
+        sha256: "28419e38311115c935ee2c117206eccbcf84a8bd16febc8a50d0f4ab66eb6aa8"

tool_kits/ui_component/g2_kit/component/avchat_component.cpp

@@ -582,7 +582,7 @@ namespace nim_comp
 			}
 			else {
 				requestTokenValue(uid);
-				while ("xyz" == stoken_)
+				while ("xyz" == stoken_ && isUseRtcSafeMode)
 				{
 					std::this_thread::yield();
 				}
@@ -755,7 +755,7 @@ namespace nim_comp
 			//std::string sValue = values["cid"].asString();
 			if (value == 1) {
 				if (notifyInfo) {
-					while ("xyz" == stoken_)
+                    while ("xyz" == stoken_ && isUseRtcSafeMode)
 					{
 						std::this_thread::yield();
 					}
@@ -875,7 +875,7 @@ namespace nim_comp
 		QLOG_APP(L"handleAccepted, version_: {0}") << version_;
 
 		requestTokenValue(channelMembers_[senderAccid]);
-		while ("xyz" == stoken_)
+        while ("xyz" == stoken_ && isUseRtcSafeMode)
 		{
 			std::this_thread::yield();
 		}
@@ -1088,12 +1088,13 @@ namespace nim_comp
 	}
 	///////////////////////////////G2事件///////////////////////////////
 	void AvChatComponent::onJoinChannel(nertc::channel_id_t cid, nertc::uid_t uid, nertc::NERtcErrorCode result, uint64_t elapsed) {
-		QLOG_APP(L"onJoinChannel");
+		QLOG_APP(L"onJoinChannel, cid: {0}, uid: {1}, result: {2}, elapsed: {3}")
+			<< cid << uid << result << elapsed;
 		//rtcEngine_->enableLocalAudio(true);
 	}
 	void AvChatComponent::onUserJoined(nertc::uid_t uid, const char* user_name)
 	{
-		QLOG_APP(L"onUserJoined");
+		QLOG_APP(L"onUserJoined, uid: {0}, user name: {1}") << uid << user_name;
 		int ret = rtcEngine_->subscribeRemoteVideoStream(uid, nertc::kNERtcRemoteVideoStreamTypeHigh, true);
 		//ret = rtcEngine_->subscribeRemoteAudioStream(uid, true);