优化 - V1.6.0 新版本支持 DPI，将新版本转换到老版本快照大小进行对比；

KdanAutoTest/KdanAuto.xcodeproj/project.pbxproj

@@ -82,6 +82,7 @@
 		24DCE8B32950543C004EBA35 /* AutoTestCellInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24DCE8B22950543C004EBA35 /* AutoTestCellInfo.swift */; };
 		24DCE8B529506CDE004EBA35 /* AutoTestProperty.plist in Resources */ = {isa = PBXBuildFile; fileRef = 24DCE8B429506CDE004EBA35 /* AutoTestProperty.plist */; };
 		24DCE8BB29518FD3004EBA35 /* ProcessThumbnal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 240509B62943479800B501B2 /* ProcessThumbnal.swift */; };
+		24FE3FF329BAF9B8004F4DD4 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24FE3FF229BAF9B8004F4DD4 /* CoreImage.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -219,6 +220,7 @@
 		24DCE8AF295047D8004EBA35 /* TestFileCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestFileCellView.swift; sourceTree = "<group>"; };
 		24DCE8B22950543C004EBA35 /* AutoTestCellInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoTestCellInfo.swift; sourceTree = "<group>"; };
 		24DCE8B429506CDE004EBA35 /* AutoTestProperty.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = AutoTestProperty.plist; sourceTree = "<group>"; };
+		24FE3FF229BAF9B8004F4DD4 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -226,6 +228,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				24FE3FF329BAF9B8004F4DD4 /* CoreImage.framework in Frameworks */,
 				2400D7DE29B9FCC90059AC45 /* libopencv_world.dylib in Frameworks */,
 				2411D9CD29ABAF36009DE4A8 /* PDFKit.framework in Frameworks */,
 				2400D7E329B9FCC90059AC45 /* libopencv_world.4.2.dylib in Frameworks */,
@@ -296,6 +299,7 @@
 		240509AF29433CDE00B501B2 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				24FE3FF229BAF9B8004F4DD4 /* CoreImage.framework */,
 				2411D9CC29ABAF36009DE4A8 /* PDFKit.framework */,
 				240509B129433CDE00B501B2 /* QuickLook.framework */,
 				240509B029433CDE00B501B2 /* QuickLookThumbnailing.framework */,

KdanAutoTest/KdanAuto.xcodeproj/xcuserdata/zhudongyong.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -116,21 +116,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "13B517F1-4C9C-49C9-9011-7FE175401600"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KdanAuto/Class/AutoTestCase/AutoTest.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "373"
-            endingLineNumber = "373"
-            landmarkName = "compareResult(_:resultPath:status:needCompare:complention:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

KdanAutoTest/KdanAuto/Class/AutoTestCase/AutoTest.swift

@@ -673,7 +673,8 @@ class AutoTest : NSObject, AutoTestProtocal {
                 let searchItems = try! FileManager.default.contentsOfDirectory(atPath: resultPath)
                 for item in NSArray(array: searchItems) {
                     let ext = NSString(string: item as! String).pathExtension.lowercased()
-                    if NSArray(array: [_extention]).contains(ext) {
+                    if (NSArray(array: [_extention]).contains(ext) &&
+                        !NSString(string: item as! String).contains("_cover.png")) {
                         let fileName = NSString(string: fName+"."+_extention+"/\(item as! String)").deletingPathExtension
                         items.add(fileName)
                     }

KdanAutoTest/KdanAuto/Class/Tools/ImageProcess/ImageProcess.swift

@@ -28,16 +28,16 @@ class ImageProcess : NSObject {
             let resultImage = rImage!
             let checkImage = cImage!
             
-            let resultImageRep = NSBitmapImageRep.init(cgImage: resultImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
-            var checkImageRep = NSBitmapImageRep.init(cgImage: checkImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
+            var resultImageRep = NSBitmapImageRep.init(cgImage: resultImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
+            let checkImageRep = NSBitmapImageRep.init(cgImage: checkImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
             
-            let rWidth = resultImageRep.pixelsWide
-            let rHeight = resultImageRep.pixelsHigh
+            var rWidth = resultImageRep.pixelsWide
+            var rHeight = resultImageRep.pixelsHigh
             //            let rBitPerPixel = resultImageRep.bitsPerPixel / 8
             //            let rBytePerRow = resultImageRep.bytesPerRow
             
-            var cWidth = checkImageRep.pixelsWide
-            var cHeight = checkImageRep.pixelsHigh
+            let cWidth = checkImageRep.pixelsWide
+            let cHeight = checkImageRep.pixelsHigh
             //            let cBitPerPixel = checkImageRep.bitsPerPixel / 8
             //            let cBytePerRow = checkImageRep.bytesPerRow
             
@@ -45,15 +45,15 @@ class ImageProcess : NSObject {
             if rHeight*cHeight > 0 &&
                 fabs(Double(rWidth-cWidth)) > 1 &&
                 fabs(Double(rWidth)/Double(rHeight) - Double(cWidth)/Double(cHeight)) < 0.001  {
-                var ciImage = CIImage(cgImage: checkImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
-                ciImage = ciImage.transformed(by: CGAffineTransformMakeScale(Double(rWidth)/Double(cWidth), Double(rHeight)/Double(cHeight)))
+                var ciImage = CIImage(cgImage: resultImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
+                ciImage = ciImage.transformed(by: CGAffineTransformMakeScale(Double(cWidth)/Double(rWidth), Double(cHeight)/Double(rHeight)))
                 let context = CIContext()
                 let cgImage = context.createCGImage(ciImage, from: ciImage.extent)
                 if cgImage != nil {
-                    checkImageRep = NSBitmapImageRep(cgImage: cgImage!);
+                    resultImageRep = NSBitmapImageRep(cgImage: cgImage!);
                     
-                    cWidth = checkImageRep.pixelsWide
-                    cHeight = checkImageRep.pixelsHigh
+                    rWidth = resultImageRep.pixelsWide
+                    rHeight = resultImageRep.pixelsHigh
                 }
             }
             
@@ -222,32 +222,32 @@ class ImageProcess : NSObject {
             let resultImage = rImage!
             var checkImage = cImage!
             
-            let resultImageRep = NSBitmapImageRep.init(cgImage: resultImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
-            var checkImageRep = NSBitmapImageRep.init(cgImage: checkImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
+            var resultImageRep = NSBitmapImageRep.init(cgImage: resultImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
+            let checkImageRep = NSBitmapImageRep.init(cgImage: checkImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
             
-            let rWidth = resultImageRep.pixelsWide
-            let rHeight = resultImageRep.pixelsHigh
+            var rWidth = resultImageRep.pixelsWide
+            var rHeight = resultImageRep.pixelsHigh
             //            let rBitPerPixel = resultImageRep.bitsPerPixel / 8
             //            let rBytePerRow = resultImageRep.bytesPerRow
             
-            var cWidth = checkImageRep.pixelsWide
-            var cHeight = checkImageRep.pixelsHigh
+            let cWidth = checkImageRep.pixelsWide
+            let cHeight = checkImageRep.pixelsHigh
             //            let cBitPerPixel = checkImageRep.bitsPerPixel / 8
             //            let cBytePerRow = checkImageRep.bytesPerRow
             
             // 图像为等比例、且长宽比相同
             if rHeight*cHeight > 0 &&
                 fabs(Double(rWidth-cWidth)) > 1 &&
-                fabs(Double(rWidth)/Double(rHeight) - Double(cWidth)/Double(cHeight)) < 0.001 {
-                var ciImage = CIImage(cgImage: checkImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
-                ciImage = ciImage.transformed(by: CGAffineTransformMakeScale(Double(rWidth)/Double(cWidth), Double(rHeight)/Double(cHeight)))
+                fabs(Double(rWidth)/Double(rHeight) - Double(cWidth)/Double(cHeight)) < 0.001  {
+                var ciImage = CIImage(cgImage: resultImage.cgImage(forProposedRect: nil, context: nil, hints: nil)!)
+                ciImage = ciImage.transformed(by: CGAffineTransformMakeScale(Double(cWidth)/Double(rWidth), Double(cHeight)/Double(rHeight)))
                 let context = CIContext()
                 let cgImage = context.createCGImage(ciImage, from: ciImage.extent)
                 if cgImage != nil {
-                    checkImageRep = NSBitmapImageRep(cgImage: cgImage!);
+                    resultImageRep = NSBitmapImageRep(cgImage: cgImage!);
                     
-                    cWidth = checkImageRep.pixelsWide
-                    cHeight = checkImageRep.pixelsHigh
+                    rWidth = resultImageRep.pixelsWide
+                    rHeight = resultImageRep.pixelsHigh
                 }
             }