!23 搜狗输入法日志版合并上线

Merge pull request !23 from 廖桂发80374374/0_0_3_st1

CMakeLists.txt

@@ -630,6 +630,10 @@ install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT re
 install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
 install(DIRECTORY "${CONAN_RES_DIRS_VIDEO}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
 
+if(CONAN_RES_DIRS_SOGOUIME)
+	install(DIRECTORY "${CONAN_RES_DIRS_SOGOUIME}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
+endif(CONAN_RES_DIRS_SOGOUIME)
+
 if(CEF_BIN_DIR)
 	file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CEF_BIN_DIR}/*")
 	foreach(item ${RVC_CHROMIUM_BIN_FILES})

Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp

@@ -367,7 +367,9 @@ ErrorCodeEnum ResourceWatcherEntity::DoCheckInstallStateJob()
     info.state.strInstallDate = Sogou_GetInstallTime();
     info.program.strInstallDir = Sogou_GetInstallPath();
     info.program.strVersion = Sogou_GetVersion();
-    Dbg("%d, %s, %s, %s", info.state.dwInstalledStatus, info.state.strInstallDate.GetData(), info.program.strInstallDir.GetData(), info.program.strVersion.GetData());
+    Dbg("%d, %s, %s, %s"
+        , info.state.dwInstalledStatus, info.state.strInstallDate.GetData()
+        , info.program.strInstallDir.GetData(), info.program.strVersion.GetData());
     Dbg("InstallTime: %s", info.state.GetInstallTime().ToTimeString().GetData());
 #endif //RVC_OS_WIN
 

Module/mod_mediacontroller/capture.cpp

@@ -1537,7 +1537,7 @@ namespace MediaController {
 				Dbg("start env video capture object failed! rc:%d", rc);
 				char strMessage[MAX_PATH*2] = {0};
 				get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoEnv, "open environ camera fail,please check device.");
-				LogError(Severity_High,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_ENVCAM_OPEN,strMessage);
+				LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_ENVCAM_OPEN,strMessage);
 				if (cap->opt_video) 
 				{
 					if (cap->env_video) 
@@ -1550,7 +1550,7 @@ namespace MediaController {
 						Dbg("start opt video capture object failed! rc:%d", rc);
 						char strMessage[MAX_PATH*2] = {0};
 						get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoOpt, "open operate camera fail,please check device.");
-						LogError(Severity_High,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN, strMessage);
+						LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN, strMessage);
 						return Error_AllCamera;
 					}
 					else
@@ -1579,7 +1579,7 @@ namespace MediaController {
 						Dbg("start opt video capture object failed! rc:%d", rc);
 						char strMessage[MAX_PATH*2] = {0};
 						get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoOpt, "open operate camera fail,please check device.");
-						LogError(Severity_High,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
+						LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
 						return Error_OptCamera;
 					}
 					else
@@ -1608,7 +1608,7 @@ namespace MediaController {
 					Dbg("start opt video capture object failed! rc:%d", rc);
 					char strMessage[MAX_PATH*2] = {0};
 					get_camera_exception_message(strMessage, MAX_PATH*2, cap->config.strVideoOpt, "open operate camera fail,please check device.");
-					LogError(Severity_High,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
+					LogWarn(Severity_Middle,Error_NotInit,ERROR_MOD_MEDIACONTROLLER_OPTCAM_OPEN,strMessage);
 					return Error_AllCamera;
 				}
 				else

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -629,12 +629,18 @@ public:
 	ErrorCodeEnum SetCameraSysVar(const CSimpleStringA &newVal)
 	{
 		CSmartPointer<IEntityFunction> spFunction = this->GetFunction();
+
+		CSimpleStringA val = newVal;
+		if ('B' == val[0]) {
+			LogError(Severity_High, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_CONFIG_ALLERROR, "all config cameras error.");
+		}
+
 		if (eStand2sType == m_eDeviceType)
 		{
 			return spFunction->SetSysVar(SYSVAR_CAMERASTATE, (LPCTSTR)newVal);
 		}
 
-		CSimpleStringA val = newVal;
+		
 		switch (val[0])
 		{
 		case 'E':
@@ -788,7 +794,7 @@ public:
 		{
 			char strMessage[MAX_PATH*2] = {0};
 			get_camera_exception_message(strMessage, MAX_PATH*2, conf.strVideoEnv, "Env camera bug detected!");
-			LogError(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_BUG, strMessage);
+			LogWarn(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_ENVCAMERA_BUG, strMessage);
 			if ((ePadtype == m_eDeviceType)||(eMobilePadType == m_eDeviceType)||(eDesk2SType == m_eDeviceType)||(eDesk1SType == m_eDeviceType)||(eDesk2SIntegratedType == m_eDeviceType))
 			{
 				// comment by ly@2019/03/19
@@ -884,7 +890,7 @@ public:
 		{
 			char strMessage[MAX_PATH*2] = {0};
 			get_camera_exception_message(strMessage, MAX_PATH*2, conf.strVideoOpt, "Opt camera bug detected!");
-			LogError(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG, strMessage);
+			LogWarn(Severity_Middle, Error_Hardware, ERROR_MOD_MEDIACONTROLLER_OPECAMERA_BUG, strMessage);
 			if (m_nCameraErrorCode == Error_Succeed)
 			{
 				m_nCameraErrorCode = Error_OptCamera;
@@ -1327,11 +1333,11 @@ private:
 				if (Error == Error_EnvCamera || Error == Error_AllCamera){
 					char strMessage[MAX_PATH*2] = {0};
 					get_camera_exception_message(strMessage, MAX_PATH*2, conf->strVideoEnv ,"ENV 摄像头打开失败，请检查设备或配置是否正确！");
-					LogError(Severity_High,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_ENVCAM_INITFAIL, strMessage);
+					LogWarn(Severity_Middle,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_ENVCAM_INITFAIL, strMessage);
 				} else if (Error == Error_OptCamera){
 					char strMessage[MAX_PATH*2] = {0};
 					get_camera_exception_message(strMessage, MAX_PATH*2, conf->strVideoOpt, "OPT 摄像头打开失败，请检查设备或配置是否正确！");
-					LogError(Severity_High,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_OPTCAM_INITFAIL, strMessage);
+					LogWarn(Severity_Middle,Error_DevMedia,ERROR_MOD_MEDIACONTROLLER_OPTCAM_INITFAIL, strMessage);
 				}
 			}
 			else 

Other/libaudiomgr/linux/libaudiomgr_linux.cpp

@@ -495,28 +495,24 @@ static void pa_state_cb(pa_context* c, void* data)
 	{
 		// These are just here for reference
 	case PA_CONTEXT_UNCONNECTED:
-		//printf("unconnected\n");
 		break;
 	case PA_CONTEXT_CONNECTING:
 	case PA_CONTEXT_AUTHORIZING:
 	case PA_CONTEXT_SETTING_NAME:
-	default:
-		//printf("no state\n");
 		break;
 	case PA_CONTEXT_FAILED:
 	case PA_CONTEXT_TERMINATED:
 		*pa_ready = 2;
-		//printf("failed\n");
 		break;
 	case PA_CONTEXT_READY:
 		*pa_ready = 1;
-		//printf("ready\n");
+		break;
+	default:
 		break;
 	}
 }
 
 
-
 /*
  * clean up and disconnect
  * args:
@@ -571,7 +567,7 @@ int AudioMgrImpl::pa_get_devicelist()
 	if (pa_context_connect(pa_ctx, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0)
 	{
 		if(m_callback)
-			m_callback->debug("AUDIO: PULSE - unable to connect to server: pa_context_connect failed");
+			m_callback->debug("AUDIO: PULSE - unable to connect to server: pa_context_connect failed!");
 		finish(pa_ctx, pa_ml);
 		return -1;
 	}
@@ -1275,7 +1271,6 @@ static void stream_request_cb(pa_stream* s, size_t length, void* data)
 
 		pa_stream_drop(s); /*clean the samples*/
 	}
-
 }
 
 
@@ -1388,8 +1383,7 @@ void* pulse_read_audio(void* data)
 	pastream_flag |= PA_STREAM_AUTO_TIMING_UPDATE;
 
 	char* dev = audio_ctx->list_input_devices[audio_ctx->device].name;
-	callback->debug("AUDIO: (pulse audio) connecting to device %s (channels %d rate %d)",
-			dev, ss.channels, ss.rate);
+	callback->debug("AUDIO: (pulse audio) connecting to device %s (channels %d rate %d)", dev, ss.channels, ss.rate);
 	r = pa_stream_connect_record(recordstream, dev, &bufattr, (pa_stream_flags_t)pastream_flag);
 	if (r < 0)
 	{
@@ -1424,7 +1418,7 @@ void* pulse_read_audio(void* data)
 	while (audio_ctx->stream_flag == AUDIO_STRM_ON){
 		pa_mainloop_iterate(pa_ml, 1, NULL);
 	}
-
+	pa_stream_set_read_callback(recordstream, NULL, NULL);
 	callback->debug("AUDIO: (pulse audio) stream terminated(%i)", audio_ctx->stream_flag);
 
 	pa_stream_disconnect(recordstream);

addin/cmake/ConfigOptions.cmake

@@ -41,4 +41,6 @@ option(WITH_CI_NUMBER "increment build number, especially CI environment" OFF)
 
 option(PACK_AS_DEB_PKG "build the project and package as debian type " OFF)
 
-option(CONAN_CACHE_CLEAR "remove local conan dependencies" OFF)
+option(CONAN_CACHE_CLEAR "remove local conan dependencies" OFF)
+
+option(WITH_ADDITIONAL_RES "download other resource file or for skipping big file mechanism like sogouime" OFF)

addin/cmake/DependencyConanFiles.cmake

@@ -80,6 +80,10 @@ else()
 	if(PACK_AS_DEB_PKG)
 		list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/1.0@LR04.02_ThirdParty/testing)
 	endif(PACK_AS_DEB_PKG)
+		list(APPEND CONAN_CURPLATFORM_LIB_NAMES sogouime/2.6.0.8357@LR04.02_MediaRes/testing)
+	if(WITH_ADDITIONAL_RES)
+		
+	endif(WITH_ADDITIONAL_RES)
 
 endif(MSVC)