#IQRV #comment 合并2.1.0版本编译报错的解决

Module/mod_recorder/CMakeLists.txt

@@ -27,9 +27,9 @@ target_link_directories(${MODULE_NAME} PRIVATE
 )
 
 if(MSVC)
-set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS} libfilecryption)
+    set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS} libfilecryption)
 else()
-set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS})
+    set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS})
 endif(MSVC)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${CONAN_PKG_LIBS_FFMPEG} libvideorecord)  
 

Module/mod_recorder/win/mod_recorder.cpp

@@ -590,31 +590,6 @@ void CRecorderEntity::StartRecord(const char *videofilename)
 	}
 }
 
-// we use root.ini Video section config to decide camera count
-ErrorCodeEnum CRecorderEntity::DecideCameraCount(int &nCount)
-{
-	CSmartPointer<IEntityFunction> spFunction = GetFunction();
-	CSmartPointer<IConfigInfo> spConfig;
-	ErrorCodeEnum Error = spFunction->OpenConfig(Config_Root, spConfig);
-	if (Error == Error_Succeed) {
-		CSimpleStringA strVideoEnv;
-		CSimpleStringA strVideoOpt;
-		SpIniMappingTable table;
-		nCount = 0;
-		table.AddEntryString("Video", "EnvCamera", strVideoEnv, "$");
-		table.AddEntryString("Video", "OptCamera", strVideoOpt, "$");
-		Error = table.Load(spConfig);
-		if (Error == Error_Succeed) {
-			if (strVideoEnv.GetLength() > 1)
-				nCount++;
-			if (strVideoOpt.GetLength() > 1)
-				nCount++;
-		}
-	}
-	return Error;
-}
-
-
 void CRecorderEntity::StopRecord()
 {
 	if (m_bStarted) {

Module/mod_sipphone/win/mod_sipphone.cpp

@@ -2648,6 +2648,58 @@ void CSIPPhoneSession::Handle_StopVideoRender(SpOnewayCallContext<PhoneService_S
 	DbgToBeidou(ctx->link, __FUNCTION__)();
 }
 
+/** for fixing compiled error Gifur@202422]*/
+void CSIPPhoneSession::Handle_GetHandfreeInVolume(SpReqAnsContext<PhoneService_GetHandfreeInVolume_Req, PhoneService_GetHandfreeInVolume_Ans>::Pointer ctx)
+{
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	ctx->Ans.Volume = m_pEntity->m_kept_volume_in[DEV_HANDFREE];
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("get hand free in volume is %d.", ctx->Ans.Volume);
+	ctx->Answer(Error_Succeed);
+}
+
+void CSIPPhoneSession::Handle_SetHandfreeInVolume(SpReqAnsContext<PhoneService_SetHandfreeInVolume_Req, PhoneService_SetHandfreeInVolume_Ans>::Pointer ctx)
+{
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	int iVolume = ctx->Req.Volume;
+	if (iVolume > 100) {
+		iVolume = 100;
+	}
+	if (iVolume < 0) {
+		iVolume = 0;
+	}
+
+	//m_pEntity->SetHandfreeInVolume(iVolume);
+	ctx->Answer(Error_NotImpl);
+}
+
+void CSIPPhoneSession::Handle_SetPickupInVolume(SpReqAnsContext<PhoneService_SetPickupInVolume_Req, PhoneService_SetPickupInVolume_Ans>::Pointer ctx)
+{
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	if (eStand2sType == m_pEntity->m_eDeviceType || eStand1SPlusType == m_pEntity->m_eDeviceType) {
+		int iVolume = ctx->Req.Volume;
+		if (iVolume > 100) {
+			iVolume = 100;
+		}
+		if (iVolume < 0) {
+			iVolume = 0;
+		}
+		//m_pEntity->SetPickupInVolume(iVolume);
+	}
+	ctx->Answer(Error_NotImpl);
+}
+
+void CSIPPhoneSession::Handle_GetPickupInVolume(SpReqAnsContext<PhoneService_GetPickupInVolume_Req, PhoneService_GetPickupInVolume_Ans>::Pointer ctx)
+{
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	if (eStand2sType == m_pEntity->m_eDeviceType || eStand1SPlusType == m_pEntity->m_eDeviceType) {
+		ctx->Ans.Volume = m_pEntity->m_kept_volume_in[DEV_PICKUP];
+	} else {
+		ctx->Ans.Volume = 0;
+	}
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("get pick up in volume is %d.", ctx->Ans.Volume);
+	ctx->Answer(Error_NotImpl);
+}
+
 void CSIPPhoneSession::Handle_BeginState( SpSubscribeContext<PhoneService_BeginState_Sub, PhoneService_PhoneState_Info>::Pointer ctx )
 {
 	m_spCallbackContext = ctx;

Module/mod_vtmloader/tokenDefine.h

@@ -1,11 +1,7 @@
 #pragma once
 #include "IHttpFunc.h"
 #include <string>
-#if defined(RVC_OS_WIN)
-#include "json.h"
-#else
 #include "json/json.h"
-#endif
 #include "SpSecureClient.h"
 
 #define TOKEN_GETURL_ERR 0x10A00001