From b3d1cd0bd0de70c7b086656ec13917649540bba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Sat, 16 May 2015 17:35:09 +0800 Subject: [PATCH 1/7] QRCode init func --- QRCode/Source/QRCode.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index e4760d5..672651f 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -24,6 +24,7 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { /// completion call back var completedCallBack: ((stringValue: String) -> ())? + ///QRCode init func public init(autoRemoveSubLayers: Bool = false, lineWidth: CGFloat = 4, strokeColor: UIColor = UIColor.greenColor(), maxDetectedCount: Int = 20) { self.lineWidth = lineWidth From ea3920727c736de8d7f97365152bf5478fbe7d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Wed, 20 May 2015 21:08:48 +0800 Subject: [PATCH 2/7] test git --- QRCode/Source/QRCode.swift | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index 020ab80..d994e6a 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -26,13 +26,9 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { /// the scan rect, default is the bounds of the scan view, can modify it if need public var scanFrame: CGRect = CGRectZero - /// init function - /// - /// :param: autoRemoveSubLayers remove sub layers auto after detected code image, defalt is false - /// :param: lineWidth line width, default is 4 - /// :param: strokeColor stroke color, default is Green - /// :param: maxDetectedCount max detecte count, default is 20 - /// + + + /// :dfasdfsdf /// :returns: the scanner object public init(autoRemoveSubLayers: Bool = false, lineWidth: CGFloat = 4, strokeColor: UIColor = UIColor.greenColor(), maxDetectedCount: Int = 20) { From 93f5a6ad967a5dbdd542b9161a946fce2affbde2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Wed, 20 May 2015 22:20:45 +0800 Subject: [PATCH 3/7] Revert "test git" This reverts commit ea3920727c736de8d7f97365152bf5478fbe7d28. --- QRCode/Source/QRCode.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index d994e6a..020ab80 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -26,9 +26,13 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { /// the scan rect, default is the bounds of the scan view, can modify it if need public var scanFrame: CGRect = CGRectZero - - - /// :dfasdfsdf + /// init function + /// + /// :param: autoRemoveSubLayers remove sub layers auto after detected code image, defalt is false + /// :param: lineWidth line width, default is 4 + /// :param: strokeColor stroke color, default is Green + /// :param: maxDetectedCount max detecte count, default is 20 + /// /// :returns: the scanner object public init(autoRemoveSubLayers: Bool = false, lineWidth: CGFloat = 4, strokeColor: UIColor = UIColor.greenColor(), maxDetectedCount: Int = 20) { From f4c3389763cb525b190d61e36f3befb5d5cbd294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Wed, 20 May 2015 22:24:47 +0800 Subject: [PATCH 4/7] goback 2 --- QRCode/Source/QRCode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index 020ab80..de342cb 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -26,7 +26,7 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { /// the scan rect, default is the bounds of the scan view, can modify it if need public var scanFrame: CGRect = CGRectZero - /// init function + /// init functiondd /// /// :param: autoRemoveSubLayers remove sub layers auto after detected code image, defalt is false /// :param: lineWidth line width, default is 4 From d2e95626b0f3311b888be1a2aa5b2a792f88302d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Wed, 20 May 2015 22:33:45 +0800 Subject: [PATCH 5/7] Revert "goback 2" This reverts commit f4c3389763cb525b190d61e36f3befb5d5cbd294. --- QRCode/Source/QRCode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index de342cb..020ab80 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -26,7 +26,7 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { /// the scan rect, default is the bounds of the scan view, can modify it if need public var scanFrame: CGRect = CGRectZero - /// init functiondd + /// init function /// /// :param: autoRemoveSubLayers remove sub layers auto after detected code image, defalt is false /// :param: lineWidth line width, default is 4 From 402f0163b1d160476e5fc7bdfee0bfd106f1e3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Wed, 20 May 2015 22:36:19 +0800 Subject: [PATCH 6/7] git test --- QRCode/Source/QRCode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index 020ab80..32994c0 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -27,7 +27,7 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { public var scanFrame: CGRect = CGRectZero /// init function - /// + /// /// :param: autoRemoveSubLayers remove sub layers auto after detected code image, defalt is false /// :param: lineWidth line width, default is 4 /// :param: strokeColor stroke color, default is Green From 6fae4fed1f8610e6ece2b8c95a5447e316b97dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=20=E5=89=91=E4=B9=92?= Date: Wed, 20 May 2015 22:41:22 +0800 Subject: [PATCH 7/7] delete blank space --- QRCode/Source/QRCode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QRCode/Source/QRCode.swift b/QRCode/Source/QRCode.swift index 32994c0..020ab80 100644 --- a/QRCode/Source/QRCode.swift +++ b/QRCode/Source/QRCode.swift @@ -27,7 +27,7 @@ public class QRCode: NSObject, AVCaptureMetadataOutputObjectsDelegate { public var scanFrame: CGRect = CGRectZero /// init function - /// + /// /// :param: autoRemoveSubLayers remove sub layers auto after detected code image, defalt is false /// :param: lineWidth line width, default is 4 /// :param: strokeColor stroke color, default is Green