Autoit v3.3.14.2 버전적용 및 버그 수정및 일부 기능업데이트

guitar/bin/GUITAR.ini

@@ -7,12 +7,12 @@ DebugTimeOut = 15000
 ;ImageTolerance = 186
 MaxImageTolerance = 35
 MultiImageRange = 20
-KeyDelay = 5
+KeyDelay = 50
 MouseDelay = 1
 InputDelay = 500
 ClickDelay = 100
 CommaDelay = 500
-DebugLog = False
+DebugLog = True
 ContinueTest = True  
 StopRequest =0
 CloseAllBrowser = True
@@ -33,6 +33,7 @@ VerifyTime = 200
 Language = korean
 ImageCapture=True
 SaveUTF8=False
+UACignore=False
 
 [REPORT]
 AreaCaptureView = 세로
@@ -46,6 +47,17 @@ DashboardHost = http://localhost:8080
 XMLReport = False
 
 
+[ErrorAccumulate]
+; 각 목록은 "," 로 다중 기록 가능
+Alarm = False
+Count =3,6,9
+SMS= True
+Email= True
+SMSList=010-0000-0000
+EmailList=idxxxxx@naver.com
+CommandlineModeOnly = True
+
+
 [ALARM]
 ; 각 목록은 "," 로 다중 기록 가능
 SMS= False
@@ -63,7 +75,7 @@ SAFARI = Safari.exe
 FIREFOX = firefox.exe
 CHROME = chrome.exe
 OPERA = opera.exe
-OTHER = AVD:emulator.exe|VNC:vncviewer.exe
+OTHER = AVD:emulator.exe|VNC:vncviewer.exe|notepad:notepad.exe
 BrowserWidth = 1100
 BrowserHeight = 900
 
@@ -155,8 +167,8 @@ Check = True
 AutoUpdate = True
 UpdateType= Major
 CheckIntervalHour=24
-UpdateRevision=276
-LastCheck=2013/09/02 15:53:03
+UpdateRevision=0
+LastCheck=2018/01/23 16:43:10
 ReadmeCRC=11059
 
 
@@ -167,5 +179,6 @@ Port = 465
 ID = idxxxxx
 Password = pwxxxxx
 EmailAddress = idxxxxx@naver.com
+
 [HTML_TAG]
 HighlightDelay=500

guitar/bin/GUITARAImageList.au3

@@ -37,8 +37,9 @@ Func _ListViewImageLoad(byref $LV, byref $Pic, $FL2A, byref $hImageList, $Guitar
 
 	$hImageList = _GUiImageList_Create($GuitarListImageWidth , $GuitarListImageHeight, 5, 3)
 
-	_GUICtrlListView_SetImageList($LV, $hImageList, 0)
+	_GUICtrlListView_SetImageList($LV, $hImageList, 1)
 
+	;debug("i1111111111 : " & ubound($FL2A) -1)
 	For $i = 1 To ubound($FL2A) -1
 
 		$hBmp = _GetImage($FL2A[$i], $GuitarListImageWidth, $GuitarListImageHeight)
@@ -48,13 +49,39 @@ Func _ListViewImageLoad(byref $LV, byref $Pic, $FL2A, byref $hImageList, $Guitar
 		;debug("추가 : " & $temp)
 		_GUICtrlListView_AddSubItem($LV, $iCnt, $FL2A[$i],1)
 		_GUICtrlListView_SetItemImage($LV, $iCnt, $iCnt)
+		;_GUICtrlListView_SetItemImage($LV, 1,1,1)
 		$iCnt += 1
 	Next
 
-	;sleep (1)
+	sleep (1)
 
 EndFunc
 
+Func _GetImage2 ($sFile, $iMW, $iMH, $iBkClr = 0xCCCCCC)
+
+    Local $GDIpBmpLarge
+    Local $GDIpBmpResized
+    Local $GDIbmp
+
+	_GDIPlus_Startup()
+
+    ; This line works-> _GUIImageList_AddBitmap($hImage, $sPath & "\Red.bmp")
+	;_debug($sFile)
+    ;$GDIpBmpLarge = _GDIPlus_BitmapCreateFromMemory(FileRead($sFile)) ;GDI+ image!
+	$GDIpBmpLarge = _GDIPlus_BitmapCreateFromMemory(FileRead("c:\ua.png")) ;GDI+ image!
+    $GDIpBmpResized = _GDIPlus_ImageResize($GDIpBmpLarge, 32,32) ;GDI+ image
+    $GDIbmp = _GDIPlus_BitmapCreateHBITMAPFromBitmap($GDIpBmpResized) ;GDI image!
+
+	_GDIPlus_BitmapDispose($GDIpBmpLarge)
+    _GDIPlus_BitmapDispose($GDIpBmpResized)
+    _WinAPI_DeleteObject($GDIbmp)
+    _GDIPlus_Shutdown()
+	_debug($GDIbmp)
+	Return $GDIbmp
+
+EndFunc
+
+
 Func _GetImage($sFile, $iMW, $iMH, $iBkClr = 0xCCCCCC)
 
     Local $hBmp1, $hBitmap, $hGraphic, $hImage, $iW, $iH, $aGS, $hBmp2

guitar/bin/GUITARCmdReceiver.au3

@@ -1,5 +1,5 @@
 #AutoIt3Wrapper_Icon=GUITARCmdReceiver.ico
-#AutoIt3Wrapper_Res_Fileversion=1.0.0.40
+#AutoIt3Wrapper_Res_Fileversion=1.0.0.42
 #AutoIt3Wrapper_Res_FileVersion_AutoIncrement=p
 
 #include-once
@@ -18,7 +18,7 @@ Global $_bReceiverDebugLog
 main()
 
 func main ()
-;메인
+;메인
 
 	local $sMainProgram
 	local $sMainProgramFullPath
@@ -44,7 +44,7 @@ func main ()
 
 	$_bReceiverDebugLog = getIniBoolean(getReadINI("environment","DebugLog"))
 
-	writeReceiverLog("프로그램 신규 실행")
+	writeReceiverLog("프로그램 신규 실행")
 
 
 	checkAdminRun()
@@ -54,7 +54,7 @@ func main ()
 
 	_setCommonPathVar()
 
-	writeReceiverLog("관리자모드 실행 확인")
+	writeReceiverLog("관리자모드 실행 확인")
 
 
 	$sReportPath = getRelativePath(getReadINI("Report","path"), @ScriptDir)
@@ -65,30 +65,30 @@ func main ()
 	$_sLastRunSciprtList = $sReportPath & "\lastrunscript.txt"
 
 
-	; 레지스트리에서 최신의 실해중이 프로세스 ID를 얻어옴
+	; 레지스트리에서 최신의 실해중이 프로세스 ID를 얻어옴
 	$sOldPid = _readSettingReg($_sRemoteRiceiver)
 	$sMainProgram = getReadINI("Environment","Main")
 
 	$sMainProgramFullPath = @ScriptDir & "\" & $sMainProgram
 
-	writeReceiverLog("경로 설정 완료")
-	writeReceiverLog("원격로그 경로 : " & $_sControlLogFile)
+	writeReceiverLog("경로 설정 완료")
+	writeReceiverLog("원격로그 경로 : " & $_sControlLogFile)
 
 
-	; 해당 프로세스가 존재하면 로그 적고 종료
+	; 해당 프로세스가 존재하면 로그 적고 종료
 
 
 	$aPlist = ProcessList (_GetScriptName() & ".exe")
 
 	if (ProcessExists($sOldPid) <> 0) and (ubound($aPlist) > 2) then
 		writeRmoteLog($_sRemoteRiceiver & " " &  _getLanguageMsg("cmdreciver_exists") & " PID : " & $sOldPid)
-		writeReceiverLog("중복 실행으로 종료")
+		writeReceiverLog("중복 실행으로 종료")
 		return
 	endif
 
-	writeReceiverLog("중복 실행 점검 완료")
+	writeReceiverLog("중복 실행 점검 완료")
 
-	; 없으면 레지에 기록
+	; 없으면 레지에 기록
 	$sNewPid = ProcessExists($_sRemoteRiceiver)
 	_writeSettingReg($_sRemoteRiceiver, $sNewPid)
 	writeRmoteLog($_sRemoteRiceiver & " run PID:" & $sNewPid)
@@ -104,7 +104,7 @@ func main ()
 
 	_writeRemoteCommand( "","", "")
 
-	writeReceiverLog("반복 진입")
+	writeReceiverLog("반복 진입")
 
 	do
 		$sCommandRunResult = False
@@ -116,7 +116,7 @@ func main ()
 
 			_writeRemoteCommand( "","","")
 
-			writeReceiverLog("명령 수행 : " &  $sCommand & ", " & $sCommandValue)
+			writeReceiverLog("명령 수행 : " &  $sCommand & ", " & $sCommandValue)
 
 			Switch  StringLower($sCommand)
 

guitar/bin/GUITARCmdSender.au3

@@ -1,15 +1,17 @@
 #AutoIt3Wrapper_Icon=GUITARCmdSender.ico
-#AutoIt3Wrapper_Res_Fileversion=1.0.0.20
+#AutoIt3Wrapper_Res_Fileversion=1.0.0.22
 #AutoIt3Wrapper_Res_FileVersion_AutoIncrement=p
 
 #include-once
 
 #include "UIACommon.au3"
+#include ".\_include_nhn\_file.au3"
+#include "GUITARLanguage.au3"
 
 main()
 
 func main ()
-;메인
+;메인
 
 	local $sCmdLine1
 	local $sCmdLine2
@@ -47,7 +49,7 @@ func main ()
 
 	;if ProcessExists($_sRemoteRiceiver) = 0 then
 	;	_setReportHtmlFile()
-	;	writeRmoteLog($_sRemoteRiceiver & " 이 서버에서 실행중이지 않아 명령을 전달하지 못하였습니다.")
+	;	writeRmoteLog($_sRemoteRiceiver & " 이 서버에서 실행중이지 않아 명령을 전달하지 못하였습니다.")
 	;endif
 
 	;_debug($_runReportPath)

guitar/bin/GUITARErrorReport.au3

@@ -60,7 +60,7 @@ Func _getErrorSumarry($sCount, $sScriptName, $sTestTime)
 	$aRetList = $aNewList
 
 	_FileReadToArray ($_sErrorSumarryFile, $aFile,0)
-	$aFile = _ArrayUnique($aFile,1)
+	$aFile = _ArrayUnique($aFile)
 
 	for $i=0 to ubound($aFile) -1
 
@@ -101,7 +101,7 @@ Func _getErrorSumarry($sCount, $sScriptName, $sTestTime)
 
 		for $j=1 to ubound($aCount) -1
 
-			if $aNewList[$i][0] = Number($aCount [$j])  and ($sTestTime = $aNewList[$i][2])then
+			if $aNewList[$i][0] = Number($aCount [$j])  and ($sTestTime = $aNewList[$i][2]) then
 
 				$iSearchIndex = ubound($aRetList)
 				redim $aRetList[$iSearchIndex + 1][ubound($aRetList,2)]
@@ -137,7 +137,7 @@ func deleteSuccessListFormErrorSumarry($sScriptName)
 
 	next
 
-	$aFile = _ArrayUnique($aFile,1)
+	$aFile = _ArrayUnique($aFile)
 	;_msg($aFile)
 	_FileWriteFromArray($_sErrorSumarryFile, $aFile,1)
 

guitar/bin/GUITARIEObject.au3

@@ -120,6 +120,7 @@ func IEObjectGetAllInnerHtml($oIE)
 	for $i=1 to ubound($aObject) -1
 
 		$oItem = $aObject[$i][1]
+
 		$sInnerHtml &= $oItem.outertext
 		;msg($oItem.outertext)
 	next
@@ -217,8 +218,6 @@ func IEObjectSearchFromObject($oIE, $sCondition, $bCountCheck)
 
 	;$oMyError = ObjEvent("AutoIt.Error","UIAIE_NavigateError")
 
-
-
 	$sSplitTemp = StringSplit($sCondition, $sGroupSplt)
 
 	redim $aCondition[ubound($sSplitTemp)][5]
@@ -282,8 +281,7 @@ func IEObjectSearchFromObject($oIE, $sCondition, $bCountCheck)
 
 	next
 
-
-	$oMyError = ObjEvent("AutoIt.Error")
+	;$oMyError = ObjEvent("AutoIt.Error")
 
 	return $aRetObject
 
@@ -605,9 +603,9 @@ func convertHtmlChar(byref $sText, $bReverse = False)
 	convertHtmlCharItem($sText,"[", "[", $bReverse)
 	convertHtmlCharItem($sText,"]", "]", $bReverse)
 	convertHtmlCharItem($sText,">", ">", $bReverse)
-	convertHtmlCharItem($sText,"&62;", ">", $bReverse)
+	convertHtmlCharItem($sText,">", ">", $bReverse)
 	convertHtmlCharItem($sText,"&lt;", "<", $bReverse)
-	convertHtmlCharItem($sText,"&60;", "<", $bReverse)
+	convertHtmlCharItem($sText,"&#60;", "<", $bReverse)
 	convertHtmlCharItem($sText,"&#94;", "^", $bReverse)
 	convertHtmlCharItem($sText,"&#124;", "|", $bReverse)
 	convertHtmlCharItem($sText,"&#123;", "}", $bReverse)

guitar/bin/GUITARMobileKeyInput.au3

@@ -286,7 +286,7 @@ func SplitKoreanDetail($aText, $bArrayType = False)
 
 	next
 
-	if $bArrayType = False then $aRet = _ArrayToString($aRet,"",1,0)
+	if $bArrayType = False then $aRet = _ArrayToString($aRet,"",1)
 
 	return $aRet
 

guitar/bin/GUITARUserFunction.au3

@@ -15,8 +15,9 @@ func _SendMail($sFrom, $sToEmail, $sTitle, $sBody,  $AttachFiles = "", $bIsUseCI
 	local $Username = getReadINI("EMAIL","ID")
 	local $Password = getReadINI("EMAIL","Password")
 	local $FromAddress = getReadINI("EMAIL","EmailAddress")
+	local $SSL = getIniBoolean(getReadINI("EMAIL","SSL"))
 
-	return _SendNaverMail($sFrom, $sToEmail, $sTitle, $sBody, $AttachFiles, $bIsUseCID, $SmtpServer , $FromAddress , $Username , $Password, $IPPort)
+	return _SendNaverMail($sFrom, $sToEmail, $sTitle, $sBody, $AttachFiles, $bIsUseCID, $SmtpServer , $FromAddress , $Username , $Password, $IPPort, $SSL )
 
 endfunc
 
@@ -65,8 +66,7 @@ func SplitKorean($sText, $bArrayType = False)
 	if $bArrayType then
 		return $aRet
 	else
-		return _ArrayToString($aRet,"")
-
+		return _ArrayToString($aRet,"",1)
 	endif
 
 endfunc
@@ -194,7 +194,7 @@ func SplitKoreanDetail($aText, $bArrayType = False)
 
 	next
 
-	if $bArrayType = False then $aRet = _ArrayToString($aRet,"",1,0)
+	if $bArrayType = False then $aRet = _ArrayToString($aRet,"",1)
 
 	return $aRet