Added additional output to CONSOLE() and ISMAS().
This commit is contained in:
		
							
								
								
									
										72
									
								
								worker.h
									
									
									
									
									
								
							
							
						
						
									
										72
									
								
								worker.h
									
									
									
									
									
								
							@@ -576,18 +576,24 @@ private:
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS_SUCCESS:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS_FAILURE:
 | 
			
		||||
        break;
 | 
			
		||||
@@ -595,12 +601,18 @@ private:
 | 
			
		||||
            // SEND_LAST_VERSION_CORRECTION
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::UPDATE_SUCCEEDED:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::UPDATE_ACTIVATED:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::UPDATE_FAILED:
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::FINISHED:
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
            Utils::printUpdateStatusMsg(debug, lst);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DEBUG: {
 | 
			
		||||
            lst << instance->m_debugMsg;
 | 
			
		||||
@@ -928,33 +940,77 @@ private:
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS:
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER_SUCCESS);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[step],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        "");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_FAILURE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER_FAILURE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS:
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[step],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        "");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY:
 | 
			
		||||
            ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS:
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[step],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        "");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS:
 | 
			
		||||
            ismasClient.setProgressInPercent(_SAVE_LOGS);
 | 
			
		||||
        break;
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS_SUCCESS:
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS_SUCCESS: {
 | 
			
		||||
            ismasClient.setProgressInPercent(_SAVE_LOGS_SUCCESS);
 | 
			
		||||
        break;
 | 
			
		||||
            QString const &ismasUpdateNews =
 | 
			
		||||
                QString("#M=APISM#C=CMD_EVENT#J=") +
 | 
			
		||||
                    ismasClient.updateNewsToIsmas(
 | 
			
		||||
                        _ISMAS_CONTINUE,
 | 
			
		||||
                        ismasClient.getProgressInPercent(),
 | 
			
		||||
                        IsmasClient::RESULT_CODE::SUCCESS,
 | 
			
		||||
                        smap[step],
 | 
			
		||||
                        instance->m_ismasMsg.join(' ').toStdString().c_str(),
 | 
			
		||||
                        "");
 | 
			
		||||
            ismasClient.sendRequestReceiveResponse(
 | 
			
		||||
                IsmasClient::APISM::DB_PORT, ismasUpdateNews);
 | 
			
		||||
        } break;
 | 
			
		||||
        case UPDATE_STEP::SAVE_LOGS_FAILURE:
 | 
			
		||||
            ismasClient.setProgressInPercent(_SAVE_LOGS_FAILURE);
 | 
			
		||||
        break;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user